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

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

@@ -572,7 +572,6 @@
       },
       "type" : "DTOS"
     },
-    "customCode" : true,
     "defaultMode" : true
   }, {
     "getAllPSDEDataQueryCodes" : [ {

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

 {
   "dBType" : "MYSQL5",
   "name" : "MySQL5",
+  "getPSDEDataQueryCodeConds" : [ {
+    "condType" : "CUSTOM",
+    "customCond" : "( <choose><when test=\"ctx.datacontext.aaaa !=null \">  t1.`FIELD9` = #{ctx.datacontext.aaaa}  </when><otherwise>1=1</otherwise></choose>  AND  t1.`FIELD45` > 1111  AND  t1.`FIELD9` IS NULL )",
+    "name" : "查询条件"
+  } ],
   "getPSDEDataQueryCodeExps" : [ {
     "expression" : "t1.`FIELD24`",
     "name" : "FIELD24"
@@ -176,6 +181,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD18`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n\nWHERE \n( t1.`FIELD45` > 1111  )",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD18`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD45`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`PBOOKID`,\nt1.`PHONEID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

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

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

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