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

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -2819,6 +2819,23 @@
       "queryCodeExp" : "t1.`DATE`",
       "standardColumnName" : "`DATE`"
     } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_DATE_GTANDEQ",
+      "name" : "N_DATE_GTANDEQ",
+      "stdDataType" : 5,
+      "valueOP" : "GTANDEQ"
+    }, {
+      "codeName" : "N_DATE_IN",
+      "name" : "N_DATE_IN",
+      "stdDataType" : 5,
+      "valueOP" : "IN",
+      "array" : true
+    }, {
+      "codeName" : "N_DATE_LTANDEQ",
+      "name" : "N_DATE_LTANDEQ",
+      "stdDataType" : 5,
+      "valueOP" : "LTANDEQ"
+    } ],
     "getAllPSDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[DATE][日期]",
@@ -2893,23 +2910,6 @@
       "queryCodeExp" : "t1.`TIME`",
       "standardColumnName" : "`TIME`"
     } ],
-    "getAllPSDEFSearchModes" : [ {
-      "codeName" : "N_TIME_GTANDEQ",
-      "name" : "N_TIME_GTANDEQ",
-      "stdDataType" : 5,
-      "valueOP" : "GTANDEQ"
-    }, {
-      "codeName" : "N_TIME_IN",
-      "name" : "N_TIME_IN",
-      "stdDataType" : 5,
-      "valueOP" : "IN",
-      "array" : true
-    }, {
-      "codeName" : "N_TIME_LTANDEQ",
-      "name" : "N_TIME_LTANDEQ",
-      "stdDataType" : 5,
-      "valueOP" : "LTANDEQ"
-    } ],
     "getAllPSDEFUIModes" : [ {
       "codeName" : "MobileDefault",
       "name" : "[TIME][时间]移动端默认",
@@ -6408,76 +6408,76 @@
       "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
-      "logicName" : "测试实体标识",
-      "name" : "N_TESTID_EQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_GTANDEQ",
       "getPSDEFSearchMode" : {
         "modelref" : true,
-        "id" : "N_TESTID_EQ"
+        "id" : "N_DATE_GTANDEQ"
       },
       "getPSDEField" : {
-        "name" : "TESTID",
-        "codeName" : "TESTId"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
+      "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "logicName" : "测试实体名称",
-      "name" : "N_TESTNAME_LIKE",
+      "logicName" : "日期",
+      "name" : "N_DATE_IN",
       "getPSDEFSearchMode" : {
         "modelref" : true,
-        "id" : "N_TESTNAME_LIKE"
+        "id" : "N_DATE_IN"
       },
       "getPSDEField" : {
-        "name" : "TESTNAME",
-        "codeName" : "TESTName"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
-      "type" : "SIMPLE"
+      "stdDataType" : 5,
+      "type" : "SIMPLES"
     }, {
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_GTANDEQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_LTANDEQ",
       "getPSDEFSearchMode" : {
         "modelref" : true,
-        "id" : "N_TIME_GTANDEQ"
+        "id" : "N_DATE_LTANDEQ"
       },
       "getPSDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "logicName" : "时间",
-      "name" : "N_TIME_IN",
+      "logicName" : "测试实体标识",
+      "name" : "N_TESTID_EQ",
       "getPSDEFSearchMode" : {
         "modelref" : true,
-        "id" : "N_TIME_IN"
+        "id" : "N_TESTID_EQ"
       },
       "getPSDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTID",
+        "codeName" : "TESTId"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
-      "type" : "SIMPLES"
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_LTANDEQ",
+      "logicName" : "测试实体名称",
+      "name" : "N_TESTNAME_LIKE",
       "getPSDEFSearchMode" : {
         "modelref" : true,
-        "id" : "N_TIME_LTANDEQ"
+        "id" : "N_TESTNAME_LIKE"
       },
       "getPSDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
       "logicName" : "类型",

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

@@ -4245,61 +4245,61 @@
       "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TESTID_EQ",
-      "logicName" : "测试实体标识",
-      "name" : "N_TESTID_EQ",
+      "codeName" : "N_DATE_GTANDEQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_GTANDEQ",
       "getPSAppDEField" : {
-        "name" : "TESTID",
-        "codeName" : "TESTId"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
+      "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TESTNAME_LIKE",
-      "logicName" : "测试实体名称",
-      "name" : "N_TESTNAME_LIKE",
+      "codeName" : "N_DATE_IN",
+      "logicName" : "日期",
+      "name" : "N_DATE_IN",
       "getPSAppDEField" : {
-        "name" : "TESTNAME",
-        "codeName" : "TESTName"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
-      "type" : "SIMPLE"
+      "stdDataType" : 5,
+      "type" : "SIMPLES"
     }, {
-      "codeName" : "N_TIME_GTANDEQ",
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_GTANDEQ",
+      "codeName" : "N_DATE_LTANDEQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_LTANDEQ",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TIME_IN",
-      "logicName" : "时间",
-      "name" : "N_TIME_IN",
+      "codeName" : "N_TESTID_EQ",
+      "logicName" : "测试实体标识",
+      "name" : "N_TESTID_EQ",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTID",
+        "codeName" : "TESTId"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
-      "type" : "SIMPLES"
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TIME_LTANDEQ",
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_LTANDEQ",
+      "codeName" : "N_TESTNAME_LIKE",
+      "logicName" : "测试实体名称",
+      "name" : "N_TESTNAME_LIKE",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
       "codeName" : "N_TYPE_EQ",

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

@@ -4245,61 +4245,61 @@
       "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TESTID_EQ",
-      "logicName" : "测试实体标识",
-      "name" : "N_TESTID_EQ",
+      "codeName" : "N_DATE_GTANDEQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_GTANDEQ",
       "getPSAppDEField" : {
-        "name" : "TESTID",
-        "codeName" : "TESTId"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
+      "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TESTNAME_LIKE",
-      "logicName" : "测试实体名称",
-      "name" : "N_TESTNAME_LIKE",
+      "codeName" : "N_DATE_IN",
+      "logicName" : "日期",
+      "name" : "N_DATE_IN",
       "getPSAppDEField" : {
-        "name" : "TESTNAME",
-        "codeName" : "TESTName"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
-      "type" : "SIMPLE"
+      "stdDataType" : 5,
+      "type" : "SIMPLES"
     }, {
-      "codeName" : "N_TIME_GTANDEQ",
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_GTANDEQ",
+      "codeName" : "N_DATE_LTANDEQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_LTANDEQ",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TIME_IN",
-      "logicName" : "时间",
-      "name" : "N_TIME_IN",
+      "codeName" : "N_TESTID_EQ",
+      "logicName" : "测试实体标识",
+      "name" : "N_TESTID_EQ",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTID",
+        "codeName" : "TESTId"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
-      "type" : "SIMPLES"
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TIME_LTANDEQ",
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_LTANDEQ",
+      "codeName" : "N_TESTNAME_LIKE",
+      "logicName" : "测试实体名称",
+      "name" : "N_TESTNAME_LIKE",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
       "codeName" : "N_TYPE_EQ",

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

@@ -1075,11 +1075,11 @@
                 "codeName" : "TESTName"
               }
             }, {
-              "id" : "time",
+              "id" : "date",
               "dataType" : 5,
               "getPSAppDEField" : {
-                "name" : "TIME",
-                "codeName" : "Time"
+                "name" : "DATE",
+                "codeName" : "Date"
               }
             }, {
               "id" : "testid",
@@ -1141,38 +1141,38 @@
                   "showCaption" : true
                 }, {
                   "getCapPSLanguageRes" : {
-                    "lanResTag" : "DEF.LNAME.TIME"
+                    "lanResTag" : "DEF.LNAME.DATE"
                   },
-                  "caption" : "时间",
-                  "codeName" : "time",
+                  "caption" : "日期",
+                  "codeName" : "date",
                   "dataType" : 5,
                   "detailStyle" : "DEFAULT",
                   "detailType" : "FORMITEM",
                   "enableCond" : 3,
                   "ignoreInput" : 0,
-                  "itemWidth" : 220.0,
+                  "itemWidth" : 230.0,
                   "labelPos" : "LEFT",
                   "labelWidth" : 130,
-                  "name" : "time",
+                  "name" : "date",
                   "noPrivDisplayMode" : 1,
                   "getPSAppDEField" : {
-                    "name" : "TIME",
-                    "codeName" : "Time"
+                    "name" : "DATE",
+                    "codeName" : "Date"
                   },
                   "getPSEditor" : {
-                    "dateTimeFormat" : "HH:mm:ss",
+                    "dateTimeFormat" : "YYYY-MM-DD",
                     "editorParams" : {
-                      "TIMEFMT" : "HH:mm:ss"
+                      "TIMEFMT" : "YYYY-MM-DD"
                     },
-                    "editorType" : "DATEPICKEREX_NODAY",
-                    "editorWidth" : 90.0,
-                    "name" : "time"
+                    "editorType" : "DATEPICKEREX_NOTIME",
+                    "editorWidth" : 100.0,
+                    "name" : "date"
                   },
                   "getPSLayoutPos" : {
                     "colMD" : 24,
                     "layout" : "TABLE_24COL"
                   },
-                  "valueFormat" : "HH:mm:ss",
+                  "valueFormat" : "YYYY-MM-DD",
                   "allowEmpty" : true,
                   "showCaption" : true
                 } ],

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

@@ -4245,61 +4245,61 @@
       "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TESTID_EQ",
-      "logicName" : "测试实体标识",
-      "name" : "N_TESTID_EQ",
+      "codeName" : "N_DATE_GTANDEQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_GTANDEQ",
       "getPSAppDEField" : {
-        "name" : "TESTID",
-        "codeName" : "TESTId"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
+      "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TESTNAME_LIKE",
-      "logicName" : "测试实体名称",
-      "name" : "N_TESTNAME_LIKE",
+      "codeName" : "N_DATE_IN",
+      "logicName" : "日期",
+      "name" : "N_DATE_IN",
       "getPSAppDEField" : {
-        "name" : "TESTNAME",
-        "codeName" : "TESTName"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 25,
-      "type" : "SIMPLE"
+      "stdDataType" : 5,
+      "type" : "SIMPLES"
     }, {
-      "codeName" : "N_TIME_GTANDEQ",
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_GTANDEQ",
+      "codeName" : "N_DATE_LTANDEQ",
+      "jsonFormat" : "yyyy-MM-dd",
+      "logicName" : "日期",
+      "name" : "N_DATE_LTANDEQ",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 5,
       "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TIME_IN",
-      "logicName" : "时间",
-      "name" : "N_TIME_IN",
+      "codeName" : "N_TESTID_EQ",
+      "logicName" : "测试实体标识",
+      "name" : "N_TESTID_EQ",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTID",
+        "codeName" : "TESTId"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
-      "type" : "SIMPLES"
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
-      "codeName" : "N_TIME_LTANDEQ",
-      "jsonFormat" : "HH:mm:ss",
-      "logicName" : "时间",
-      "name" : "N_TIME_LTANDEQ",
+      "codeName" : "N_TESTNAME_LIKE",
+      "logicName" : "测试实体名称",
+      "name" : "N_TESTNAME_LIKE",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
       },
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 5,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
       "codeName" : "N_TYPE_EQ",

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

@@ -120,11 +120,11 @@
       "codeName" : "TESTName"
     }
   }, {
-    "id" : "time",
+    "id" : "date",
     "dataType" : 5,
     "getPSAppDEField" : {
-      "name" : "TIME",
-      "codeName" : "Time"
+      "name" : "DATE",
+      "codeName" : "Date"
     }
   }, {
     "id" : "testid",
@@ -186,38 +186,38 @@
         "showCaption" : true
       }, {
         "getCapPSLanguageRes" : {
-          "lanResTag" : "DEF.LNAME.TIME"
+          "lanResTag" : "DEF.LNAME.DATE"
         },
-        "caption" : "时间",
-        "codeName" : "time",
+        "caption" : "日期",
+        "codeName" : "date",
         "dataType" : 5,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
         "ignoreInput" : 0,
-        "itemWidth" : 220.0,
+        "itemWidth" : 230.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "time",
+        "name" : "date",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "TIME",
-          "codeName" : "Time"
+          "name" : "DATE",
+          "codeName" : "Date"
         },
         "getPSEditor" : {
-          "dateTimeFormat" : "HH:mm:ss",
+          "dateTimeFormat" : "YYYY-MM-DD",
           "editorParams" : {
-            "TIMEFMT" : "HH:mm:ss"
+            "TIMEFMT" : "YYYY-MM-DD"
           },
-          "editorType" : "DATEPICKEREX_NODAY",
-          "editorWidth" : 90.0,
-          "name" : "time"
+          "editorType" : "DATEPICKEREX_NOTIME",
+          "editorWidth" : 100.0,
+          "name" : "date"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
-        "valueFormat" : "HH:mm:ss",
+        "valueFormat" : "YYYY-MM-DD",
         "allowEmpty" : true,
         "showCaption" : true
       } ],

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

@@ -1293,41 +1293,20 @@
           "align" : "LEFT",
           "cLConvertMode" : "NONE",
           "getCapPSLanguageRes" : {
-            "lanResTag" : "DEF.LNAME.UPDATEDATE"
+            "lanResTag" : "DEF.LNAME.DATE"
           },
-          "caption" : "更新时间",
-          "codeName" : "updatedate",
+          "caption" : "日期",
+          "codeName" : "date",
           "columnType" : "DEFGRIDCOLUMN",
-          "dataItemName" : "updatedate",
-          "excelCaption" : "更新时间",
-          "name" : "updatedate",
-          "noPrivDisplayMode" : 1,
-          "getPSAppDEField" : {
-            "name" : "UPDATEDATE",
-            "codeName" : "UpdateDate"
-          },
-          "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-          "width" : 150,
-          "widthUnit" : "PX",
-          "enableSort" : true
-        }, {
-          "align" : "LEFT",
-          "cLConvertMode" : "NONE",
-          "getCapPSLanguageRes" : {
-            "lanResTag" : "DEF.LNAME.TIME"
-          },
-          "caption" : "时间",
-          "codeName" : "time",
-          "columnType" : "DEFGRIDCOLUMN",
-          "dataItemName" : "time",
-          "excelCaption" : "时间",
-          "name" : "time",
+          "dataItemName" : "date",
+          "excelCaption" : "日期",
+          "name" : "date",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "TIME",
-            "codeName" : "Time"
+            "name" : "DATE",
+            "codeName" : "Date"
           },
-          "valueFormat" : "HH:mm:ss",
+          "valueFormat" : "YYYY-MM-DD",
           "width" : 100,
           "widthUnit" : "PX",
           "enableSort" : true
@@ -1347,20 +1326,12 @@
             "codeName" : "UpdateMan"
           }
         }, {
-          "format" : "YYYY-MM-DD HH:mm:ss",
-          "dataType" : 5,
-          "name" : "updatedate",
-          "getPSAppDEField" : {
-            "name" : "UPDATEDATE",
-            "codeName" : "UpdateDate"
-          }
-        }, {
-          "format" : "HH:mm:ss",
+          "format" : "YYYY-MM-DD",
           "dataType" : 5,
-          "name" : "time",
+          "name" : "date",
           "getPSAppDEField" : {
-            "name" : "TIME",
-            "codeName" : "Time"
+            "name" : "DATE",
+            "codeName" : "Date"
           }
         }, {
           "dataType" : 25,

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

@@ -77,41 +77,20 @@
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
     "getCapPSLanguageRes" : {
-      "lanResTag" : "DEF.LNAME.UPDATEDATE"
+      "lanResTag" : "DEF.LNAME.DATE"
     },
-    "caption" : "更新时间",
-    "codeName" : "updatedate",
+    "caption" : "日期",
+    "codeName" : "date",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "updatedate",
-    "excelCaption" : "更新时间",
-    "name" : "updatedate",
+    "dataItemName" : "date",
+    "excelCaption" : "日期",
+    "name" : "date",
     "noPrivDisplayMode" : 1,
     "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
-      "codeName" : "UpdateDate"
+      "name" : "DATE",
+      "codeName" : "Date"
     },
-    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-    "width" : 150,
-    "widthUnit" : "PX",
-    "enableSort" : true
-  }, {
-    "align" : "LEFT",
-    "cLConvertMode" : "NONE",
-    "getCapPSLanguageRes" : {
-      "lanResTag" : "DEF.LNAME.TIME"
-    },
-    "caption" : "时间",
-    "codeName" : "time",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "time",
-    "excelCaption" : "时间",
-    "name" : "time",
-    "noPrivDisplayMode" : 1,
-    "getPSAppDEField" : {
-      "name" : "TIME",
-      "codeName" : "Time"
-    },
-    "valueFormat" : "HH:mm:ss",
+    "valueFormat" : "YYYY-MM-DD",
     "width" : 100,
     "widthUnit" : "PX",
     "enableSort" : true
@@ -131,20 +110,12 @@
       "codeName" : "UpdateMan"
     }
   }, {
-    "format" : "YYYY-MM-DD HH:mm:ss",
-    "dataType" : 5,
-    "name" : "updatedate",
-    "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
-      "codeName" : "UpdateDate"
-    }
-  }, {
-    "format" : "HH:mm:ss",
+    "format" : "YYYY-MM-DD",
     "dataType" : 5,
-    "name" : "time",
+    "name" : "date",
     "getPSAppDEField" : {
-      "name" : "TIME",
-      "codeName" : "Time"
+      "name" : "DATE",
+      "codeName" : "Date"
     }
   }, {
     "dataType" : 25,

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

@@ -205,44 +205,19 @@
     "hidden" : false,
     "showCaption" : false
   }, {
-    "caption" : "联系人",
+    "caption" : "日期(In)",
     "dataType" : 5,
     "itemType" : "FILTER",
-    "itemWidth" : 100.0,
     "labelPos" : "NONE",
     "labelWidth" : 0,
-    "name" : "item11",
+    "name" : "N_DATE_IN",
     "getPSAppDEField" : {
       "name" : "DATE",
       "codeName" : "Date"
     },
-    "getPSEditor" : {
-      "dateTimeFormat" : "YYYY-MM-DD",
-      "editorParams" : {
-        "TIMEFMT" : "YYYY-MM-DD"
-      },
-      "editorType" : "DATEPICKEREX_NOTIME",
-      "editorWidth" : 100.0,
-      "name" : "item11"
-    },
-    "allowEmpty" : true,
-    "emptyCaption" : false,
-    "hidden" : false,
-    "showCaption" : false
-  }, {
-    "caption" : "时间(In)",
-    "dataType" : 5,
-    "itemType" : "FILTER",
-    "labelPos" : "NONE",
-    "labelWidth" : 0,
-    "name" : "N_TIME_IN",
-    "getPSAppDEField" : {
-      "name" : "TIME",
-      "codeName" : "Time"
-    },
     "getPSDEFSearchMode" : {
-      "codeName" : "N_TIME_IN",
-      "name" : "N_TIME_IN",
+      "codeName" : "N_DATE_IN",
+      "name" : "N_DATE_IN",
       "stdDataType" : 5,
       "valueOP" : "IN",
       "array" : true
@@ -253,63 +228,63 @@
         "TIMEFMT" : "YYYY-MM-DD"
       },
       "editorType" : "DATERANGE_NOTIME",
-      "name" : "N_TIME_IN",
+      "name" : "N_DATE_IN",
       "getPSEditorItems" : [ {
-        "name" : "N_TIME_GTANDEQ"
+        "name" : "N_DATE_GTANDEQ"
       }, {
-        "name" : "N_TIME_LTANDEQ"
+        "name" : "N_DATE_LTANDEQ"
       } ]
     },
-    "valueItemName" : "N_TIME_GTANDEQ;N_TIME_LTANDEQ",
+    "valueItemName" : "N_DATE_GTANDEQ;N_DATE_LTANDEQ",
     "allowEmpty" : true,
     "emptyCaption" : false,
     "hidden" : false,
     "showCaption" : false
   }, {
-    "caption" : "时间(<=)",
+    "caption" : "日期(>=)",
     "dataType" : 5,
     "itemType" : "FILTER",
     "labelPos" : "NONE",
     "labelWidth" : 0,
-    "name" : "N_TIME_LTANDEQ",
+    "name" : "N_DATE_GTANDEQ",
     "getPSAppDEField" : {
-      "name" : "TIME",
-      "codeName" : "Time"
+      "name" : "DATE",
+      "codeName" : "Date"
     },
     "getPSDEFSearchMode" : {
-      "codeName" : "N_TIME_LTANDEQ",
-      "name" : "N_TIME_LTANDEQ",
+      "codeName" : "N_DATE_GTANDEQ",
+      "name" : "N_DATE_GTANDEQ",
       "stdDataType" : 5,
-      "valueOP" : "LTANDEQ"
+      "valueOP" : "GTANDEQ"
     },
     "getPSEditor" : {
       "editorType" : "HIDDEN",
-      "name" : "N_TIME_LTANDEQ"
+      "name" : "N_DATE_GTANDEQ"
     },
     "allowEmpty" : true,
     "emptyCaption" : false,
     "hidden" : true,
     "showCaption" : false
   }, {
-    "caption" : "时间(>=)",
+    "caption" : "日期(<=)",
     "dataType" : 5,
     "itemType" : "FILTER",
     "labelPos" : "NONE",
     "labelWidth" : 0,
-    "name" : "N_TIME_GTANDEQ",
+    "name" : "N_DATE_LTANDEQ",
     "getPSAppDEField" : {
-      "name" : "TIME",
-      "codeName" : "Time"
+      "name" : "DATE",
+      "codeName" : "Date"
     },
     "getPSDEFSearchMode" : {
-      "codeName" : "N_TIME_GTANDEQ",
-      "name" : "N_TIME_GTANDEQ",
+      "codeName" : "N_DATE_LTANDEQ",
+      "name" : "N_DATE_LTANDEQ",
       "stdDataType" : 5,
-      "valueOP" : "GTANDEQ"
+      "valueOP" : "LTANDEQ"
     },
     "getPSEditor" : {
       "editorType" : "HIDDEN",
-      "name" : "N_TIME_GTANDEQ"
+      "name" : "N_DATE_LTANDEQ"
     },
     "allowEmpty" : true,
     "emptyCaption" : false,

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

@@ -1196,11 +1196,11 @@
                   "codeName" : "TESTName"
                 }
               }, {
-                "id" : "time",
+                "id" : "date",
                 "dataType" : 5,
                 "getPSAppDEField" : {
-                  "name" : "TIME",
-                  "codeName" : "Time"
+                  "name" : "DATE",
+                  "codeName" : "Date"
                 }
               }, {
                 "id" : "testid",
@@ -1262,38 +1262,38 @@
                     "showCaption" : true
                   }, {
                     "getCapPSLanguageRes" : {
-                      "lanResTag" : "DEF.LNAME.TIME"
+                      "lanResTag" : "DEF.LNAME.DATE"
                     },
-                    "caption" : "时间",
-                    "codeName" : "time",
+                    "caption" : "日期",
+                    "codeName" : "date",
                     "dataType" : 5,
                     "detailStyle" : "DEFAULT",
                     "detailType" : "FORMITEM",
                     "enableCond" : 3,
                     "ignoreInput" : 0,
-                    "itemWidth" : 220.0,
+                    "itemWidth" : 230.0,
                     "labelPos" : "LEFT",
                     "labelWidth" : 130,
-                    "name" : "time",
+                    "name" : "date",
                     "noPrivDisplayMode" : 1,
                     "getPSAppDEField" : {
-                      "name" : "TIME",
-                      "codeName" : "Time"
+                      "name" : "DATE",
+                      "codeName" : "Date"
                     },
                     "getPSEditor" : {
-                      "dateTimeFormat" : "HH:mm:ss",
+                      "dateTimeFormat" : "YYYY-MM-DD",
                       "editorParams" : {
-                        "TIMEFMT" : "HH:mm:ss"
+                        "TIMEFMT" : "YYYY-MM-DD"
                       },
-                      "editorType" : "DATEPICKEREX_NODAY",
-                      "editorWidth" : 90.0,
-                      "name" : "time"
+                      "editorType" : "DATEPICKEREX_NOTIME",
+                      "editorWidth" : 100.0,
+                      "name" : "date"
                     },
                     "getPSLayoutPos" : {
                       "colMD" : 24,
                       "layout" : "TABLE_24COL"
                     },
-                    "valueFormat" : "HH:mm:ss",
+                    "valueFormat" : "YYYY-MM-DD",
                     "allowEmpty" : true,
                     "showCaption" : true
                   } ],

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

@@ -509,44 +509,19 @@
         "hidden" : false,
         "showCaption" : false
       }, {
-        "caption" : "联系人",
+        "caption" : "日期(In)",
         "dataType" : 5,
         "itemType" : "FILTER",
-        "itemWidth" : 100.0,
         "labelPos" : "NONE",
         "labelWidth" : 0,
-        "name" : "item11",
+        "name" : "N_DATE_IN",
         "getPSAppDEField" : {
           "name" : "DATE",
           "codeName" : "Date"
         },
-        "getPSEditor" : {
-          "dateTimeFormat" : "YYYY-MM-DD",
-          "editorParams" : {
-            "TIMEFMT" : "YYYY-MM-DD"
-          },
-          "editorType" : "DATEPICKEREX_NOTIME",
-          "editorWidth" : 100.0,
-          "name" : "item11"
-        },
-        "allowEmpty" : true,
-        "emptyCaption" : false,
-        "hidden" : false,
-        "showCaption" : false
-      }, {
-        "caption" : "时间(In)",
-        "dataType" : 5,
-        "itemType" : "FILTER",
-        "labelPos" : "NONE",
-        "labelWidth" : 0,
-        "name" : "N_TIME_IN",
-        "getPSAppDEField" : {
-          "name" : "TIME",
-          "codeName" : "Time"
-        },
         "getPSDEFSearchMode" : {
-          "codeName" : "N_TIME_IN",
-          "name" : "N_TIME_IN",
+          "codeName" : "N_DATE_IN",
+          "name" : "N_DATE_IN",
           "stdDataType" : 5,
           "valueOP" : "IN",
           "array" : true
@@ -557,63 +532,63 @@
             "TIMEFMT" : "YYYY-MM-DD"
           },
           "editorType" : "DATERANGE_NOTIME",
-          "name" : "N_TIME_IN",
+          "name" : "N_DATE_IN",
           "getPSEditorItems" : [ {
-            "name" : "N_TIME_GTANDEQ"
+            "name" : "N_DATE_GTANDEQ"
           }, {
-            "name" : "N_TIME_LTANDEQ"
+            "name" : "N_DATE_LTANDEQ"
           } ]
         },
-        "valueItemName" : "N_TIME_GTANDEQ;N_TIME_LTANDEQ",
+        "valueItemName" : "N_DATE_GTANDEQ;N_DATE_LTANDEQ",
         "allowEmpty" : true,
         "emptyCaption" : false,
         "hidden" : false,
         "showCaption" : false
       }, {
-        "caption" : "时间(<=)",
+        "caption" : "日期(>=)",
         "dataType" : 5,
         "itemType" : "FILTER",
         "labelPos" : "NONE",
         "labelWidth" : 0,
-        "name" : "N_TIME_LTANDEQ",
+        "name" : "N_DATE_GTANDEQ",
         "getPSAppDEField" : {
-          "name" : "TIME",
-          "codeName" : "Time"
+          "name" : "DATE",
+          "codeName" : "Date"
         },
         "getPSDEFSearchMode" : {
-          "codeName" : "N_TIME_LTANDEQ",
-          "name" : "N_TIME_LTANDEQ",
+          "codeName" : "N_DATE_GTANDEQ",
+          "name" : "N_DATE_GTANDEQ",
           "stdDataType" : 5,
-          "valueOP" : "LTANDEQ"
+          "valueOP" : "GTANDEQ"
         },
         "getPSEditor" : {
           "editorType" : "HIDDEN",
-          "name" : "N_TIME_LTANDEQ"
+          "name" : "N_DATE_GTANDEQ"
         },
         "allowEmpty" : true,
         "emptyCaption" : false,
         "hidden" : true,
         "showCaption" : false
       }, {
-        "caption" : "时间(>=)",
+        "caption" : "日期(<=)",
         "dataType" : 5,
         "itemType" : "FILTER",
         "labelPos" : "NONE",
         "labelWidth" : 0,
-        "name" : "N_TIME_GTANDEQ",
+        "name" : "N_DATE_LTANDEQ",
         "getPSAppDEField" : {
-          "name" : "TIME",
-          "codeName" : "Time"
+          "name" : "DATE",
+          "codeName" : "Date"
         },
         "getPSDEFSearchMode" : {
-          "codeName" : "N_TIME_GTANDEQ",
-          "name" : "N_TIME_GTANDEQ",
+          "codeName" : "N_DATE_LTANDEQ",
+          "name" : "N_DATE_LTANDEQ",
           "stdDataType" : 5,
-          "valueOP" : "GTANDEQ"
+          "valueOP" : "LTANDEQ"
         },
         "getPSEditor" : {
           "editorType" : "HIDDEN",
-          "name" : "N_TIME_GTANDEQ"
+          "name" : "N_DATE_LTANDEQ"
         },
         "allowEmpty" : true,
         "emptyCaption" : false,
@@ -1213,41 +1188,20 @@
               "align" : "LEFT",
               "cLConvertMode" : "NONE",
               "getCapPSLanguageRes" : {
-                "lanResTag" : "DEF.LNAME.UPDATEDATE"
-              },
-              "caption" : "更新时间",
-              "codeName" : "updatedate",
-              "columnType" : "DEFGRIDCOLUMN",
-              "dataItemName" : "updatedate",
-              "excelCaption" : "更新时间",
-              "name" : "updatedate",
-              "noPrivDisplayMode" : 1,
-              "getPSAppDEField" : {
-                "name" : "UPDATEDATE",
-                "codeName" : "UpdateDate"
-              },
-              "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-              "width" : 150,
-              "widthUnit" : "PX",
-              "enableSort" : true
-            }, {
-              "align" : "LEFT",
-              "cLConvertMode" : "NONE",
-              "getCapPSLanguageRes" : {
-                "lanResTag" : "DEF.LNAME.TIME"
+                "lanResTag" : "DEF.LNAME.DATE"
               },
-              "caption" : "时间",
-              "codeName" : "time",
+              "caption" : "日期",
+              "codeName" : "date",
               "columnType" : "DEFGRIDCOLUMN",
-              "dataItemName" : "time",
-              "excelCaption" : "时间",
-              "name" : "time",
+              "dataItemName" : "date",
+              "excelCaption" : "日期",
+              "name" : "date",
               "noPrivDisplayMode" : 1,
               "getPSAppDEField" : {
-                "name" : "TIME",
-                "codeName" : "Time"
+                "name" : "DATE",
+                "codeName" : "Date"
               },
-              "valueFormat" : "HH:mm:ss",
+              "valueFormat" : "YYYY-MM-DD",
               "width" : 100,
               "widthUnit" : "PX",
               "enableSort" : true
@@ -1267,20 +1221,12 @@
                 "codeName" : "UpdateMan"
               }
             }, {
-              "format" : "YYYY-MM-DD HH:mm:ss",
-              "dataType" : 5,
-              "name" : "updatedate",
-              "getPSAppDEField" : {
-                "name" : "UPDATEDATE",
-                "codeName" : "UpdateDate"
-              }
-            }, {
-              "format" : "HH:mm:ss",
+              "format" : "YYYY-MM-DD",
               "dataType" : 5,
-              "name" : "time",
+              "name" : "date",
               "getPSAppDEField" : {
-                "name" : "TIME",
-                "codeName" : "Time"
+                "name" : "DATE",
+                "codeName" : "Date"
               }
             }, {
               "dataType" : 25,

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

@@ -466,41 +466,20 @@
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DEF.LNAME.UPDATEDATE"
+        "lanResTag" : "DEF.LNAME.DATE"
       },
-      "caption" : "更新时间",
-      "codeName" : "updatedate",
+      "caption" : "日期",
+      "codeName" : "date",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updatedate",
-      "excelCaption" : "更新时间",
-      "name" : "updatedate",
+      "dataItemName" : "date",
+      "excelCaption" : "日期",
+      "name" : "date",
       "noPrivDisplayMode" : 1,
       "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
-        "codeName" : "UpdateDate"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
-      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-      "width" : 150,
-      "widthUnit" : "PX",
-      "enableSort" : true
-    }, {
-      "align" : "LEFT",
-      "cLConvertMode" : "NONE",
-      "getCapPSLanguageRes" : {
-        "lanResTag" : "DEF.LNAME.TIME"
-      },
-      "caption" : "时间",
-      "codeName" : "time",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "time",
-      "excelCaption" : "时间",
-      "name" : "time",
-      "noPrivDisplayMode" : 1,
-      "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
-      },
-      "valueFormat" : "HH:mm:ss",
+      "valueFormat" : "YYYY-MM-DD",
       "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
@@ -520,20 +499,12 @@
         "codeName" : "UpdateMan"
       }
     }, {
-      "format" : "YYYY-MM-DD HH:mm:ss",
-      "dataType" : 5,
-      "name" : "updatedate",
-      "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
-        "codeName" : "UpdateDate"
-      }
-    }, {
-      "format" : "HH:mm:ss",
+      "format" : "YYYY-MM-DD",
       "dataType" : 5,
-      "name" : "time",
+      "name" : "date",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "DATE",
+        "codeName" : "Date"
       }
     }, {
       "dataType" : 25,

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

@@ -748,11 +748,11 @@
         "codeName" : "TESTName"
       }
     }, {
-      "id" : "time",
+      "id" : "date",
       "dataType" : 5,
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "DATE",
+        "codeName" : "Date"
       }
     }, {
       "id" : "testid",
@@ -814,38 +814,38 @@
           "showCaption" : true
         }, {
           "getCapPSLanguageRes" : {
-            "lanResTag" : "DEF.LNAME.TIME"
+            "lanResTag" : "DEF.LNAME.DATE"
           },
-          "caption" : "时间",
-          "codeName" : "time",
+          "caption" : "日期",
+          "codeName" : "date",
           "dataType" : 5,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
           "ignoreInput" : 0,
-          "itemWidth" : 220.0,
+          "itemWidth" : 230.0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "time",
+          "name" : "date",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "TIME",
-            "codeName" : "Time"
+            "name" : "DATE",
+            "codeName" : "Date"
           },
           "getPSEditor" : {
-            "dateTimeFormat" : "HH:mm:ss",
+            "dateTimeFormat" : "YYYY-MM-DD",
             "editorParams" : {
-              "TIMEFMT" : "HH:mm:ss"
+              "TIMEFMT" : "YYYY-MM-DD"
             },
-            "editorType" : "DATEPICKEREX_NODAY",
-            "editorWidth" : 90.0,
-            "name" : "time"
+            "editorType" : "DATEPICKEREX_NOTIME",
+            "editorWidth" : 100.0,
+            "name" : "date"
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
-          "valueFormat" : "HH:mm:ss",
+          "valueFormat" : "YYYY-MM-DD",
           "allowEmpty" : true,
           "showCaption" : true
         } ],

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

@@ -458,41 +458,20 @@
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DEF.LNAME.UPDATEDATE"
+        "lanResTag" : "DEF.LNAME.DATE"
       },
-      "caption" : "更新时间",
-      "codeName" : "updatedate",
+      "caption" : "日期",
+      "codeName" : "date",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updatedate",
-      "excelCaption" : "更新时间",
-      "name" : "updatedate",
+      "dataItemName" : "date",
+      "excelCaption" : "日期",
+      "name" : "date",
       "noPrivDisplayMode" : 1,
       "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
-        "codeName" : "UpdateDate"
+        "name" : "DATE",
+        "codeName" : "Date"
       },
-      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-      "width" : 150,
-      "widthUnit" : "PX",
-      "enableSort" : true
-    }, {
-      "align" : "LEFT",
-      "cLConvertMode" : "NONE",
-      "getCapPSLanguageRes" : {
-        "lanResTag" : "DEF.LNAME.TIME"
-      },
-      "caption" : "时间",
-      "codeName" : "time",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "time",
-      "excelCaption" : "时间",
-      "name" : "time",
-      "noPrivDisplayMode" : 1,
-      "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
-      },
-      "valueFormat" : "HH:mm:ss",
+      "valueFormat" : "YYYY-MM-DD",
       "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
@@ -512,20 +491,12 @@
         "codeName" : "UpdateMan"
       }
     }, {
-      "format" : "YYYY-MM-DD HH:mm:ss",
-      "dataType" : 5,
-      "name" : "updatedate",
-      "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
-        "codeName" : "UpdateDate"
-      }
-    }, {
-      "format" : "HH:mm:ss",
+      "format" : "YYYY-MM-DD",
       "dataType" : 5,
-      "name" : "time",
+      "name" : "date",
       "getPSAppDEField" : {
-        "name" : "TIME",
-        "codeName" : "Time"
+        "name" : "DATE",
+        "codeName" : "Date"
       }
     }, {
       "dataType" : 25,

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

@@ -1414,41 +1414,20 @@
             "align" : "LEFT",
             "cLConvertMode" : "NONE",
             "getCapPSLanguageRes" : {
-              "lanResTag" : "DEF.LNAME.UPDATEDATE"
+              "lanResTag" : "DEF.LNAME.DATE"
             },
-            "caption" : "更新时间",
-            "codeName" : "updatedate",
+            "caption" : "日期",
+            "codeName" : "date",
             "columnType" : "DEFGRIDCOLUMN",
-            "dataItemName" : "updatedate",
-            "excelCaption" : "更新时间",
-            "name" : "updatedate",
-            "noPrivDisplayMode" : 1,
-            "getPSAppDEField" : {
-              "name" : "UPDATEDATE",
-              "codeName" : "UpdateDate"
-            },
-            "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-            "width" : 150,
-            "widthUnit" : "PX",
-            "enableSort" : true
-          }, {
-            "align" : "LEFT",
-            "cLConvertMode" : "NONE",
-            "getCapPSLanguageRes" : {
-              "lanResTag" : "DEF.LNAME.TIME"
-            },
-            "caption" : "时间",
-            "codeName" : "time",
-            "columnType" : "DEFGRIDCOLUMN",
-            "dataItemName" : "time",
-            "excelCaption" : "时间",
-            "name" : "time",
+            "dataItemName" : "date",
+            "excelCaption" : "日期",
+            "name" : "date",
             "noPrivDisplayMode" : 1,
             "getPSAppDEField" : {
-              "name" : "TIME",
-              "codeName" : "Time"
+              "name" : "DATE",
+              "codeName" : "Date"
             },
-            "valueFormat" : "HH:mm:ss",
+            "valueFormat" : "YYYY-MM-DD",
             "width" : 100,
             "widthUnit" : "PX",
             "enableSort" : true
@@ -1468,20 +1447,12 @@
               "codeName" : "UpdateMan"
             }
           }, {
-            "format" : "YYYY-MM-DD HH:mm:ss",
-            "dataType" : 5,
-            "name" : "updatedate",
-            "getPSAppDEField" : {
-              "name" : "UPDATEDATE",
-              "codeName" : "UpdateDate"
-            }
-          }, {
-            "format" : "HH:mm:ss",
+            "format" : "YYYY-MM-DD",
             "dataType" : 5,
-            "name" : "time",
+            "name" : "date",
             "getPSAppDEField" : {
-              "name" : "TIME",
-              "codeName" : "Time"
+              "name" : "DATE",
+              "codeName" : "Date"
             }
           }, {
             "dataType" : 25,

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: