zhujiamin 发布系统代码 [TrainSys，网页端]

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json

@@ -1667,6 +1667,47 @@
       "mobileMode" : true
     } ],
     "getAllPSDEFValueRules" : [ {
+      "codeName" : "ValueRule8",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+      "name" : "field7值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "OR",
+          "condType" : "GROUP",
+          "name" : "[条件组]OR",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "VALUERANGE2",
+            "dEFName" : "FIELD7",
+            "maxValue" : 20.0,
+            "minValue" : 10.0,
+            "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
+            "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          }, {
+            "condType" : "VALUERANGE2",
+            "dEFName" : "FIELD7",
+            "maxValue" : 40.0,
+            "minValue" : 30.0,
+            "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
+            "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          } ],
+          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+        } ],
+        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+      "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    }, {
       "codeName" : "Default",
       "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/Default",
       "name" : "默认规则",
@@ -1756,6 +1797,45 @@
       "type" : "DEFAULT"
     } ],
     "getAllPSDEFValueRules" : [ {
+      "codeName" : "ValueRule7",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "name" : "field6值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "[条件组]AND",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "NOTEQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 不等于(<>) (10)",
+            "paramValue" : "10"
+          }, {
+            "condOp" : "NOTEQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 不等于(<>) (20)",
+            "paramValue" : "20"
+          }, {
+            "condOp" : "GT",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 大于(>) (5)",
+            "paramValue" : "5"
+          } ]
+        } ]
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "ruleInfo" : "field6值规则",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    }, {
       "codeName" : "Default",
       "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/Default",
       "name" : "默认规则",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1209,16 +1209,16 @@
     "mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"