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

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

@@ -525,13 +525,15 @@
         "getPSDEDQConditions" : [ {
           "condOp" : "GT",
           "condType" : "SINGLE",
-          "condValue" : "111",
+          "condValue" : "aaa",
           "fieldName" : "FIELD45",
-          "name" : "FIELD45 大于(>) (111)",
+          "name" : "FIELD45 大于(>) 数据上下文(aaa)",
           "getPSDEField" : {
             "name" : "FIELD45",
             "codeName" : "FIELD45"
-          }
+          },
+          "getPSVARTypeId" : "DATACONTEXT",
+          "ignoreEmpty" : true
         }, {
           "condOp" : "ISNULL",
           "condType" : "SINGLE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -3,7 +3,7 @@
   "name" : "MySQL5",
   "getPSDEDataQueryCodeConds" : [ {
     "condType" : "CUSTOM",
-    "customCond" : "( t1.`FIELD45` <![CDATA[>]]> 111  AND  t1.`FIELD9` IS NULL )",
+    "customCond" : "( <choose><when test=\"ctx.datacontext.aaa !=null \">  t1.`FIELD45` > #{ctx.datacontext.aaa}  </when><otherwise>1=1</otherwise></choose>  AND  t1.`FIELD9` IS NULL )",
     "name" : "查询条件"
   } ],
   "getPSDEDataQueryCodeExps" : [ {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Simple/PSDEDQCODES/MYSQL5.json

@@ -3,7 +3,7 @@
   "name" : "MySQL5",
   "getPSDEDataQueryCodeConds" : [ {
     "condType" : "CUSTOM",
-    "customCond" : "( t1.`TYPE` = 历史  AND  ( t1.`BOOKNAME` LIKE 我了个老天爷 ) )",
+    "customCond" : "( t1.`TYPE` = '历史'  AND  ( t1.`BOOKNAME` LIKE '%我了个老天爷%' ) )",
     "name" : "查询条件"
   } ],
   "getPSDEDataQueryCodeExps" : [ {

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

@@ -481,6 +481,19 @@
     "ignoreError" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
+    "getADPSDEDQConditions" : [ {
+      "condOp" : "GT",
+      "condType" : "SINGLE",
+      "condValue" : "aaa",
+      "fieldName" : "FIELD45",
+      "name" : "FIELD45 大于(>) 数据上下文(aaa)",
+      "getPSDEField" : {
+        "name" : "FIELD45",
+        "codeName" : "FIELD45"
+      },
+      "getPSVARTypeId" : "DATACONTEXT",
+      "ignoreEmpty" : true
+    } ],
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",
     "name" : "FetchDefault",
@@ -3469,6 +3482,19 @@
     "needResourceKey" : true,
     "noServiceCodeName" : true
   }, {
+    "getADPSDEDQConditions" : [ {
+      "condOp" : "GT",
+      "condType" : "SINGLE",
+      "condValue" : "aaa",
+      "fieldName" : "FIELD45",
+      "name" : "FIELD45 大于(>) 数据上下文(aaa)",
+      "getPSDEField" : {
+        "name" : "FIELD45",
+        "codeName" : "FIELD45"
+      },
+      "getPSVARTypeId" : "DATACONTEXT",
+      "ignoreEmpty" : true
+    } ],
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",
     "name" : "FetchDefault",

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

@@ -1049,16 +1049,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {

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

@@ -481,6 +481,19 @@
     "ignoreError" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
+    "getADPSDEDQConditions" : [ {
+      "condOp" : "GT",
+      "condType" : "SINGLE",
+      "condValue" : "aaa",
+      "fieldName" : "FIELD45",
+      "name" : "FIELD45 大于(>) 数据上下文(aaa)",
+      "getPSDEField" : {
+        "name" : "FIELD45",
+        "codeName" : "FIELD45"
+      },
+      "getPSVARTypeId" : "DATACONTEXT",
+      "ignoreEmpty" : true
+    } ],
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",
     "name" : "FetchDefault",
@@ -3469,6 +3482,19 @@
     "needResourceKey" : true,
     "noServiceCodeName" : true
   }, {
+    "getADPSDEDQConditions" : [ {
+      "condOp" : "GT",
+      "condType" : "SINGLE",
+      "condValue" : "aaa",
+      "fieldName" : "FIELD45",
+      "name" : "FIELD45 大于(>) 数据上下文(aaa)",
+      "getPSDEField" : {
+        "name" : "FIELD45",
+        "codeName" : "FIELD45"
+      },
+      "getPSVARTypeId" : "DATACONTEXT",
+      "ignoreEmpty" : true
+    } ],
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",
     "name" : "FetchDefault",

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

@@ -2157,16 +2157,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   } ],
@@ -20168,6 +20168,19 @@
         "ignoreError" : true
       } ],
       "getAllPSAppDEDataSets" : [ {
+        "getADPSDEDQConditions" : [ {
+          "condOp" : "GT",
+          "condType" : "SINGLE",
+          "condValue" : "aaa",
+          "fieldName" : "FIELD45",
+          "name" : "FIELD45 大于(>) 数据上下文(aaa)",
+          "getPSDEField" : {
+            "name" : "FIELD45",
+            "codeName" : "FIELD45"
+          },
+          "getPSVARTypeId" : "DATACONTEXT",
+          "ignoreEmpty" : true
+        } ],
         "codeName" : "FetchDefault",
         "methodType" : "FETCH",
         "name" : "FetchDefault",
@@ -23156,6 +23169,19 @@
         "needResourceKey" : true,
         "noServiceCodeName" : true
       }, {
+        "getADPSDEDQConditions" : [ {
+          "condOp" : "GT",
+          "condType" : "SINGLE",
+          "condValue" : "aaa",
+          "fieldName" : "FIELD45",
+          "name" : "FIELD45 大于(>) 数据上下文(aaa)",
+          "getPSDEField" : {
+            "name" : "FIELD45",
+            "codeName" : "FIELD45"
+          },
+          "getPSVARTypeId" : "DATACONTEXT",
+          "ignoreEmpty" : true
+        } ],
         "codeName" : "FetchDefault",
         "methodType" : "FETCH",
         "name" : "FetchDefault",