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

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -198,7 +198,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-171-8">
+    <changeSet author="root" id="tab-reginfo-173-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -326,7 +326,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]外键关系 -->
-    <changeSet author="root" id="fk-reginfo-171-13">
+    <changeSet author="root" id="fk-reginfo-173-13">
        <addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/>
     </changeSet>
 

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json

@@ -56,7 +56,7 @@
     "index" : 0,
     "name" : "bar_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
-      "groupMode" : "MONTH",
+      "groupMode" : "CODELIST",
       "index" : 0,
       "name" : "age",
       "getPSCodeList" : {
@@ -65,6 +65,15 @@
       },
       "groupField" : true,
       "id" : "0"
+    }, {
+      "index" : 1,
+      "name" : "reginfoid",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+      },
+      "groupField" : true,
+      "id" : "1"
     } ],
     "id" : "0"
   } ],
@@ -129,7 +138,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList82.json"
     },
     "eChartsType" : "bar",
-    "groupMode" : "MONTH",
+    "groupMode" : "CODELIST",
     "idField" : "age",
     "index" : 0,
     "name" : "bar_0",
@@ -144,6 +153,7 @@
     "getPSChartSeriesEncode" : {
       "index" : 0,
       "itemId" : "age",
+      "itemName" : "reginfoid",
       "name" : "坐标系编码",
       "getPSChartXAxis" : {
         "modelref" : true,
@@ -158,6 +168,7 @@
       "y" : [ "age" ],
       "id" : "0"
     },
+    "seriesField" : "reginfoid",
     "seriesLayoutBy" : "column",
     "getSeriesPSCodeList" : {
       "modelref" : true,

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

@@ -261,7 +261,7 @@
       "index" : 0,
       "name" : "bar_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
-        "groupMode" : "MONTH",
+        "groupMode" : "CODELIST",
         "index" : 0,
         "name" : "age",
         "getPSCodeList" : {
@@ -270,6 +270,15 @@
         },
         "groupField" : true,
         "id" : "0"
+      }, {
+        "index" : 1,
+        "name" : "reginfoid",
+        "getPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+        },
+        "groupField" : true,
+        "id" : "1"
       } ],
       "id" : "0"
     } ],
@@ -408,7 +417,7 @@
         "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList82.json"
       },
       "eChartsType" : "bar",
-      "groupMode" : "MONTH",
+      "groupMode" : "CODELIST",
       "idField" : "age",
       "index" : 0,
       "name" : "bar_0",
@@ -423,6 +432,7 @@
       "getPSChartSeriesEncode" : {
         "index" : 0,
         "itemId" : "age",
+        "itemName" : "reginfoid",
         "name" : "坐标系编码",
         "getPSChartXAxis" : {
           "modelref" : true,
@@ -437,6 +447,7 @@
         "y" : [ "age" ],
         "id" : "0"
       },
+      "seriesField" : "reginfoid",
       "seriesLayoutBy" : "column",
       "getSeriesPSCodeList" : {
         "modelref" : true,

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

@@ -29172,7 +29172,7 @@
           "index" : 0,
           "name" : "bar_0-DEFAULT",
           "getPSChartDataSetFields" : [ {
-            "groupMode" : "MONTH",
+            "groupMode" : "CODELIST",
             "index" : 0,
             "name" : "age",
             "getPSCodeList" : {
@@ -29181,6 +29181,15 @@
             },
             "groupField" : true,
             "id" : "0"
+          }, {
+            "index" : 1,
+            "name" : "reginfoid",
+            "getPSCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+            },
+            "groupField" : true,
+            "id" : "1"
           } ],
           "id" : "0"
         } ],
@@ -29319,7 +29328,7 @@
             "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList82.json"
           },
           "eChartsType" : "bar",
-          "groupMode" : "MONTH",
+          "groupMode" : "CODELIST",
           "idField" : "age",
           "index" : 0,
           "name" : "bar_0",
@@ -29334,6 +29343,7 @@
           "getPSChartSeriesEncode" : {
             "index" : 0,
             "itemId" : "age",
+            "itemName" : "reginfoid",
             "name" : "坐标系编码",
             "getPSChartXAxis" : {
               "modelref" : true,
@@ -29348,6 +29358,7 @@
             "y" : [ "age" ],
             "id" : "0"
           },
+          "seriesField" : "reginfoid",
           "seriesLayoutBy" : "column",
           "getSeriesPSCodeList" : {
             "modelref" : true,