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

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

@@ -131,6 +131,15 @@
   }, {
     "expression" : "t1.`FIELD41`",
     "name" : "FIELD41"
+  }, {
+    "expression" : "t1.`FIELD42`",
+    "name" : "FIELD42"
+  }, {
+    "expression" : "t1.`FIELD43`",
+    "name" : "FIELD43"
+  }, {
+    "expression" : "t1.`FIELD44`",
+    "name" : "FIELD44"
   }, {
     "expression" : "t1.`FIELD5`",
     "name" : "FIELD5"
@@ -159,7 +168,7 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\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.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\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.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdedataqueries/DEFAULT/psdedqcodes/MYSQL5",
   "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/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -131,6 +131,15 @@
   }, {
     "expression" : "t1.`FIELD41`",
     "name" : "FIELD41"
+  }, {
+    "expression" : "t1.`FIELD42`",
+    "name" : "FIELD42"
+  }, {
+    "expression" : "t1.`FIELD43`",
+    "name" : "FIELD43"
+  }, {
+    "expression" : "t1.`FIELD44`",
+    "name" : "FIELD44"
   }, {
     "expression" : "t1.`FIELD5`",
     "name" : "FIELD5"
@@ -159,7 +168,7 @@
     "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.`FIELD24`,\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.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "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.`FIELD24`,\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.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdedataqueries/VIEW/psdedqcodes/MYSQL5",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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"

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

@@ -2682,6 +2682,126 @@
     "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field41",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD42/psappdefuimodes/Default",
+      "name" : "[FIELD42][属性42]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD42/psdefformitems/Default",
+        "name" : "[FIELD42][属性42]",
+        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field42/psdefformitems/Default",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field42/psappdefuimodes/Default",
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD42/psappdefuimodes/MobileDefault",
+      "name" : "[FIELD42][属性42]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD42/psdefformitems/MobileDefault",
+        "name" : "[FIELD42][属性42]移动端默认",
+        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field42/psdefformitems/MobileDefault",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field42/psappdefuimodes/MobileDefault",
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "Field42",
+    "logicName" : "属性42",
+    "name" : "FIELD42",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field42",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD43/psappdefuimodes/Default",
+      "name" : "[FIELD43][属性43]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD43/psdefformitems/Default",
+        "name" : "[FIELD43][属性43]",
+        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field43/psdefformitems/Default",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field43/psappdefuimodes/Default",
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD43/psappdefuimodes/MobileDefault",
+      "name" : "[FIELD43][属性43]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD43/psdefformitems/MobileDefault",
+        "name" : "[FIELD43][属性43]移动端默认",
+        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field43/psdefformitems/MobileDefault",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field43/psappdefuimodes/MobileDefault",
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "Field43",
+    "logicName" : "属性43",
+    "name" : "FIELD43",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field43",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD44/psappdefuimodes/MobileDefault",
+      "name" : "[FIELD44][属性44]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD44/psdefformitems/MobileDefault",
+        "name" : "[FIELD44][属性44]移动端默认",
+        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field44/psdefformitems/MobileDefault",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field44/psappdefuimodes/MobileDefault",
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD44/psappdefuimodes/Default",
+      "name" : "[FIELD44][属性44]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD44/psdefformitems/Default",
+        "name" : "[FIELD44][属性44]",
+        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field44/psdefformitems/Default",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field44/psappdefuimodes/Default",
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "Field44",
+    "logicName" : "属性44",
+    "name" : "FIELD44",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field44",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BookDTO",
@@ -3209,6 +3329,42 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field42",
+      "logicName" : "属性42",
+      "name" : "Field42",
+      "getPSAppDEField" : {
+        "name" : "FIELD42",
+        "codeName" : "Field42"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookDTO/psappdemethoddtofields/Field42",
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field43",
+      "logicName" : "属性43",
+      "name" : "Field43",
+      "getPSAppDEField" : {
+        "name" : "FIELD43",
+        "codeName" : "Field43"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookDTO/psappdemethoddtofields/Field43",
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field44",
+      "logicName" : "属性44",
+      "name" : "Field44",
+      "getPSAppDEField" : {
+        "name" : "FIELD44",
+        "codeName" : "Field44"
+      },
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookDTO/psappdemethoddtofields/Field44",
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "Field5",
       "logicName" : "属性5",

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

@@ -485,6 +485,25 @@
   }, {
     "id" : "formitemex2",
     "dataType" : 25
+  }, {
+    "id" : "formitem14",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD42",
+      "codeName" : "Field42"
+    }
+  }, {
+    "id" : "formitem13",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD41",
+      "codeName" : "Field41"
+    }
+  }, {
+    "id" : "formitemex3",
+    "dataType" : 25
   }, {
     "id" : "createman",
     "dataType" : 25,
@@ -2878,6 +2897,91 @@
           "allowEmpty" : true,
           "compositeItem" : true,
           "showCaption" : true
+        }, {
+          "caption" : "时间范围（YYYY-MM-DD）",
+          "codeName" : "formitemex3",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "mOSFilePath" : "psdeformdetail_formitemices/formitemex3",
+          "name" : "formitemex3",
+          "noPrivDisplayMode" : 1,
+          "getPSDEFormItems" : [ {
+            "caption" : "属性42",
+            "codeName" : "formitem14",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/formitem14",
+            "name" : "formitem14",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD42",
+              "codeName" : "Field42"
+            },
+            "getPSEditor" : {
+              "editorType" : "HIDDEN",
+              "name" : "formitem14"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/formitem14",
+            "allowEmpty" : true,
+            "hidden" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "属性41",
+            "codeName" : "formitem13",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitems/formitem13",
+            "name" : "formitem13",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "FIELD41",
+              "codeName" : "Field41"
+            },
+            "getPSEditor" : {
+              "editorType" : "HIDDEN",
+              "name" : "formitem13"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitems/formitem13",
+            "allowEmpty" : true,
+            "hidden" : true,
+            "showCaption" : true
+          } ],
+          "getPSEditor" : {
+            "dateTimeFormat" : "YYYY-MM-DD",
+            "editorParams" : {
+              "TIMEFMT" : "YYYY-MM-DD"
+            },
+            "editorType" : "DATERANGE_NOTIME",
+            "name" : "formitemex3",
+            "getPSEditorItems" : [ {
+              "name" : "formitem14"
+            }, {
+              "name" : "formitem13"
+            } ]
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "rTMOSFilePath" : "psdeformdetail_formitemices/formitemex3",
+          "allowEmpty" : true,
+          "compositeItem" : true,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "childColLG" : -1,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json

@@ -140,37 +140,6 @@
     },
     "getPSDEFormItemName" : "field5",
     "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "name" : "amount值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "EQ",
-          "condType" : "SIMPLE",
-          "dEFName" : "AMOUNT",
-          "name" : "[常规条件] 等于(=) (100)",
-          "paramType" : "SRCENTITYFIELD",
-          "paramValue" : "100",
-          "ruleInfo" : "amount等于100"
-        } ],
-        "ruleInfo" : "amount等于100"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "ruleInfo" : "amount等于100",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "amount",
-    "valueRuleType" : "DEFVALUERULE"
   }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
@@ -350,6 +319,37 @@
     },
     "getPSDEFormItemName" : "field8",
     "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "name" : "amount值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SIMPLE",
+          "dEFName" : "AMOUNT",
+          "name" : "[常规条件] 等于(=) (100)",
+          "paramType" : "SRCENTITYFIELD",
+          "paramValue" : "100",
+          "ruleInfo" : "amount等于100"
+        } ],
+        "ruleInfo" : "amount等于100"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "ruleInfo" : "amount等于100",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "amount",
+    "valueRuleType" : "DEFVALUERULE"
   }, {
     "checkMode" : 3,
     "name" : "表单项值规则",

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

@@ -269,37 +269,6 @@
       },
       "getPSDEFormItemName" : "field5",
       "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-        "name" : "amount值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "EQ",
-            "condType" : "SIMPLE",
-            "dEFName" : "AMOUNT",
-            "name" : "[常规条件] 等于(=) (100)",
-            "paramType" : "SRCENTITYFIELD",
-            "paramValue" : "100",
-            "ruleInfo" : "amount等于100"
-          } ],
-          "ruleInfo" : "amount等于100"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-        "ruleInfo" : "amount等于100",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "amount",
-      "valueRuleType" : "DEFVALUERULE"
     }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
@@ -479,6 +448,37 @@
       },
       "getPSDEFormItemName" : "field8",
       "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+        "name" : "amount值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "EQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "AMOUNT",
+            "name" : "[常规条件] 等于(=) (100)",
+            "paramType" : "SRCENTITYFIELD",
+            "paramValue" : "100",
+            "ruleInfo" : "amount等于100"
+          } ],
+          "ruleInfo" : "amount等于100"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+        "ruleInfo" : "amount等于100",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "amount",
+      "valueRuleType" : "DEFVALUERULE"
     }, {
       "checkMode" : 3,
       "name" : "表单项值规则",

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

@@ -1821,6 +1821,25 @@
     }, {
       "id" : "formitemex2",
       "dataType" : 25
+    }, {
+      "id" : "formitem14",
+      "hidden" : true,
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD42",
+        "codeName" : "Field42"
+      }
+    }, {
+      "id" : "formitem13",
+      "hidden" : true,
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD41",
+        "codeName" : "Field41"
+      }
+    }, {
+      "id" : "formitemex3",
+      "dataType" : 25
     }, {
       "id" : "createman",
       "dataType" : 25,
@@ -4214,6 +4233,91 @@
             "allowEmpty" : true,
             "compositeItem" : true,
             "showCaption" : true
+          }, {
+            "caption" : "时间范围（YYYY-MM-DD）",
+            "codeName" : "formitemex3",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "mOSFilePath" : "psdeformdetail_formitemices/formitemex3",
+            "name" : "formitemex3",
+            "noPrivDisplayMode" : 1,
+            "getPSDEFormItems" : [ {
+              "caption" : "属性42",
+              "codeName" : "formitem14",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/formitem14",
+              "name" : "formitem14",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "FIELD42",
+                "codeName" : "Field42"
+              },
+              "getPSEditor" : {
+                "editorType" : "HIDDEN",
+                "name" : "formitem14"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/formitem14",
+              "allowEmpty" : true,
+              "hidden" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "属性41",
+              "codeName" : "formitem13",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/formitem13",
+              "name" : "formitem13",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "FIELD41",
+                "codeName" : "Field41"
+              },
+              "getPSEditor" : {
+                "editorType" : "HIDDEN",
+                "name" : "formitem13"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/formitem13",
+              "allowEmpty" : true,
+              "hidden" : true,
+              "showCaption" : true
+            } ],
+            "getPSEditor" : {
+              "dateTimeFormat" : "YYYY-MM-DD",
+              "editorParams" : {
+                "TIMEFMT" : "YYYY-MM-DD"
+              },
+              "editorType" : "DATERANGE_NOTIME",
+              "name" : "formitemex3",
+              "getPSEditorItems" : [ {
+                "name" : "formitem14"
+              }, {
+                "name" : "formitem13"
+              } ]
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_formitemices/formitemex3",
+            "allowEmpty" : true,
+            "compositeItem" : true,
+            "showCaption" : true
           } ],
           "getPSLayout" : {
             "childColLG" : -1,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -383,6 +383,33 @@
       "rTMOSFilePath" : "pssysdbschemes/A869db62931b97a65fd/pssysdbtables/T_BOOK/pssysdbcolumns/FIELD41",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "FIELD42",
+      "length" : 100,
+      "logicName" : "属性42",
+      "mOSFilePath" : "pssysdbschemes/A869db62931b97a65fd/pssysdbtables/T_BOOK/pssysdbcolumns/FIELD42",
+      "name" : "FIELD42",
+      "rTMOSFilePath" : "pssysdbschemes/A869db62931b97a65fd/pssysdbtables/T_BOOK/pssysdbcolumns/FIELD42",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD43",
+      "length" : 100,
+      "logicName" : "属性43",
+      "mOSFilePath" : "pssysdbschemes/A869db62931b97a65fd/pssysdbtables/T_BOOK/pssysdbcolumns/FIELD43",
+      "name" : "FIELD43",
+      "rTMOSFilePath" : "pssysdbschemes/A869db62931b97a65fd/pssysdbtables/T_BOOK/pssysdbcolumns/FIELD43",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD44",
+      "length" : 100,
+      "logicName" : "属性44",
+      "mOSFilePath" : "pssysdbschemes/A869db62931b97a65fd/pssysdbtables/T_BOOK/pssysdbcolumns/FIELD44",
+      "name" : "FIELD44",
+      "rTMOSFilePath" : "pssysdbschemes/A869db62931b97a65fd/pssysdbtables/T_BOOK/pssysdbcolumns/FIELD44",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "FIELD5",
       "length" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json

@@ -3254,6 +3254,51 @@
       "enableModify" : true,
       "keyField" : false,
       "majorField" : false
+    }, {
+      "codeName" : "Field42",
+      "codeName2" : "Field42",
+      "logicName" : "属性42",
+      "mOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Book/psdeserviceapifields/Field42",
+      "name" : "FIELD42",
+      "orderValue" : 1000,
+      "rTMOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Book/psdeserviceapifields/Field42",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
+    }, {
+      "codeName" : "Field43",
+      "codeName2" : "Field43",
+      "logicName" : "属性43",
+      "mOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Book/psdeserviceapifields/Field43",
+      "name" : "FIELD43",
+      "orderValue" : 1000,
+      "rTMOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Book/psdeserviceapifields/Field43",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
+    }, {
+      "codeName" : "Field44",
+      "codeName2" : "Field44",
+      "logicName" : "属性44",
+      "mOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Book/psdeserviceapifields/Field44",
+      "name" : "FIELD44",
+      "orderValue" : 1000,
+      "rTMOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Book/psdeserviceapifields/Field44",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
     } ],
     "getPSDEServiceAPIMethods" : [ {
       "dataAccessAction" : "CREATE",