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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json

@@ -3733,13 +3733,12 @@
           "name" : "连接条件组",
           "getPSDELogicLinkConds" : [ {
             "condOP" : "CONTAINS",
-            "dstFieldName" : "MONEY",
             "getDstLogicParam" : {
               "modelref" : true,
               "id" : "Default"
             },
             "logicType" : "SINGLE",
-            "name" : "Default[MONEY] 包含属性(Contains)",
+            "name" : "Default 包含属性(Contains)",
             "getSrcLogicParam" : {
               "modelref" : true,
               "id" : "Default"
@@ -4060,6 +4059,10 @@
     "enableBackend" : true,
     "enableFront" : false
   } ],
+  "getAllPSDEMSLogics" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEMSLOGICS/test11.json"
+  } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "PhoneDTO",
     "getPSDEMethodDTOFields" : [ {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/testcontains.json

@@ -21,13 +21,12 @@
         "name" : "连接条件组",
         "getPSDELogicLinkConds" : [ {
           "condOP" : "CONTAINS",
-          "dstFieldName" : "MONEY",
           "getDstLogicParam" : {
             "modelref" : true,
             "id" : "Default"
           },
           "logicType" : "SINGLE",
-          "name" : "Default[MONEY] 包含属性(Contains)",
+          "name" : "Default 包含属性(Contains)",
           "getSrcLogicParam" : {
             "modelref" : true,
             "id" : "Default"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEMSLOGICS/test11.json

+{
+  "codeName" : "test11",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEMSLOGICS/test11.json",
+  "logicName" : "test11",
+  "name" : "test11"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/Phone.json

@@ -2001,13 +2001,12 @@
           "name" : "连接条件组",
           "getPSDELogicLinkConds" : [ {
             "condOP" : "CONTAINS",
-            "dstFieldName" : "MONEY",
             "getDstLogicParam" : {
               "modelref" : true,
               "id" : "Default"
             },
             "logicType" : "SINGLE",
-            "name" : "Default[MONEY] 包含属性(Contains)",
+            "name" : "Default 包含属性(Contains)",
             "getSrcLogicParam" : {
               "modelref" : true,
               "id" : "Default"

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

@@ -27496,13 +27496,12 @@
               "name" : "连接条件组",
               "getPSDELogicLinkConds" : [ {
                 "condOP" : "CONTAINS",
-                "dstFieldName" : "MONEY",
                 "getDstLogicParam" : {
                   "modelref" : true,
                   "id" : "Default"
                 },
                 "logicType" : "SINGLE",
-                "name" : "Default[MONEY] 包含属性(Contains)",
+                "name" : "Default 包含属性(Contains)",
                 "getSrcLogicParam" : {
                   "modelref" : true,
                   "id" : "Default"

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

@@ -2001,13 +2001,12 @@
           "name" : "连接条件组",
           "getPSDELogicLinkConds" : [ {
             "condOP" : "CONTAINS",
-            "dstFieldName" : "MONEY",
             "getDstLogicParam" : {
               "modelref" : true,
               "id" : "Default"
             },
             "logicType" : "SINGLE",
-            "name" : "Default[MONEY] 包含属性(Contains)",
+            "name" : "Default 包含属性(Contains)",
             "getSrcLogicParam" : {
               "modelref" : true,
               "id" : "Default"

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

@@ -8039,13 +8039,12 @@
               "name" : "连接条件组",
               "getPSDELogicLinkConds" : [ {
                 "condOP" : "CONTAINS",
-                "dstFieldName" : "MONEY",
                 "getDstLogicParam" : {
                   "modelref" : true,
                   "id" : "Default"
                 },
                 "logicType" : "SINGLE",
-                "name" : "Default[MONEY] 包含属性(Contains)",
+                "name" : "Default 包含属性(Contains)",
                 "getSrcLogicParam" : {
                   "modelref" : true,
                   "id" : "Default"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json

@@ -2055,13 +2055,12 @@
           "name" : "连接条件组",
           "getPSDELogicLinkConds" : [ {
             "condOP" : "CONTAINS",
-            "dstFieldName" : "MONEY",
             "getDstLogicParam" : {
               "modelref" : true,
               "id" : "Default"
             },
             "logicType" : "SINGLE",
-            "name" : "Default[MONEY] 包含属性(Contains)",
+            "name" : "Default 包含属性(Contains)",
             "getSrcLogicParam" : {
               "modelref" : true,
               "id" : "Default"

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

@@ -141991,13 +141991,16 @@
               "name" : "连接条件组",
               "getPSDELogicLinkConds" : [ {
                 "condOP" : "CONTAINS",
-                "dstFieldName" : "MONEY",
                 "getDstLogicParam" : {
                   "modelref" : true,
                   "id" : "Default"
                 },
                 "logicType" : "SINGLE",
-                "name" : "Default[MONEY] 包含属性(Contains)"
+                "name" : "Default 包含属性(Contains)",
+                "getSrcLogicParam" : {
+                  "modelref" : true,
+                  "id" : "Default"
+                }
               } ]
             },
             "getSrcPSDELogicNode" : {
@@ -143465,6 +143468,20 @@
             },
             "linkMode" : 0,
             "name" : "连接名称",
+            "getPSDEUILogicLinkGroupCond" : {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "getPSDEUILogicLinkConds" : [ {
+                "condOP" : "CONTAINS",
+                "dstFieldName" : "lowprice",
+                "getDstLogicParam" : {
+                  "modelref" : true,
+                  "id" : "Default"
+                },
+                "logicType" : "SINGLE",
+                "name" : "Default[lowprice] 包含属性(Contains)"
+              } ]
+            },
             "getSrcPSDEUILogicNode" : {
               "modelref" : true,
               "id" : "Begin"
@@ -143472,12 +143489,6 @@
           } ],
           "topPos" : 200,
           "parallelOutput" : true
-        }, {
-          "codeName" : "END1",
-          "leftPos" : 603,
-          "logicNodeType" : "END",
-          "name" : "结束",
-          "topPos" : 208
         }, {
           "codeName" : "DELOGIC1",
           "getDstPSAppDELogic" : {
@@ -143508,6 +143519,12 @@
             }
           } ],
           "topPos" : 216
+        }, {
+          "codeName" : "END1",
+          "leftPos" : 603,
+          "logicNodeType" : "END",
+          "name" : "结束",
+          "topPos" : 208
         } ],
         "getPSDEUILogicParams" : [ {
           "codeName" : "Default",