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

62be8225 · ibizdev · a67a2099 · 62be8225 · 62be8225 · 62be8225
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json
@@ -265,6 +265,56 @@
    "tableType" : "MAIN"
  } ],
  "getAllPSDEDataQueries" : [ {
+    "getAllPSDEDataQueryCodes" : [ {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/DataQuery2/PSDEDQCODES/MYSQL5.json"
+    } ],
+    "codeName" : "DataQuery2",
+    "logicName" : "数据查询2",
+    "mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedataqueries/DATAQUERY2",
+    "name" : "DATAQUERY2",
+    "getPSDEDQMain" : {
+      "getJoinPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo.json"
+      },
+      "joinType" : "MAIN",
+      "name" : "REGINFO",
+      "getPSDEDQGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "连接条件",
+        "getPSDEDQConditions" : [ {
+          "condOp" : "GTANDEQ",
+          "condType" : "SINGLE",
+          "condValue" : "20",
+          "fieldName" : "AGE",
+          "name" : "(AGE) 大于等于(>=) 20",
+          "getPSDEField" : {
+            "name" : "AGE",
+            "codeName" : "Age"
+          }
+        } ]
+      }
+    },
+    "getPSDEDataQueryInput" : {
+      "name" : "DataQuery2Input",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataQueryReturn" : {
+      "name" : "DataQuery2Result",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoDTO"
+      },
+      "type" : "DTOS"
+    },
+    "rTMOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedataqueries/DATAQUERY2"
+  }, {
    "getAllPSDEDataQueryCodes" : [ {
      "modelref" : true,
      "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
@@ -314,6 +364,7 @@
      "type" : "DTOS"
    },
    "rTMOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedataqueries/DEFAULT",
+    "viewLevel" : 0,
    "defaultMode" : true
  }, {
    "getAllPSDEDataQueryCodes" : [ {
@@ -392,6 +443,34 @@
    "viewLevel" : 0
  } ],
  "getAllPSDEDataSets" : [ {
+    "codeName" : "DataQuery2",
+    "logicName" : "数据查询2",
+    "mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedatasets/DATAQUERY2",
+    "name" : "DATAQUERY2",
+    "getPSDEDataQueries" : [ {
+      "modelref" : true,
+      "id" : "DataQuery2"
+    } ],
+    "getPSDEDataSetInput" : {
+      "name" : "DataQuery2Input",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataSetReturn" : {
+      "name" : "DataQuery2Result",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoDTO"
+      },
+      "type" : "PAGE"
+    },
+    "rTMOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedatasets/DATAQUERY2",
+    "enableBackend" : true,
+    "enableFront" : true
+  }, {
    "codeName" : "DataSet2",
    "logicName" : "数据集2",
    "mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedatasets/DATASET2",
@@ -441,6 +520,7 @@
      "type" : "PAGE"
    },
    "rTMOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedatasets/DEFAULT",
+    "viewLevel" : 0,
    "defaultMode" : true,
    "enableBackend" : true,
    "enableFront" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/DataQuery2/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/DataQuery2/PSDEDQCODES/MYSQL5.json
+{
+  "dBType" : "MYSQL5",
+  "mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedataqueries/DATAQUERY2/psdedqcodes/MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeConds" : [ {
+    "condType" : "CUSTOM",
+    "customCond" : "( t1.`AGE` >= 20 )",
+    "name" : "查询条件"
+  } ],
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`ADDRESS`",
+    "name" : "ADDRESS"
+  }, {
+    "expression" : "t1.`AGE`",
+    "name" : "AGE"
+  }, {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEPARTMENT`",
+    "name" : "DEPARTMENT"
+  }, {
+    "expression" : "t1.`DEPTID`",
+    "name" : "DEPTID"
+  }, {
+    "expression" : "t1.`FIELD`",
+    "name" : "FIELD"
+  }, {
+    "expression" : "t1.`NAME`",
+    "name" : "NAME"
+  }, {
+    "expression" : "t1.`ORGID`",
+    "name" : "ORGID"
+  }, {
+    "expression" : "t1.`REGINFOID`",
+    "name" : "REGINFOID"
+  }, {
+    "expression" : "t1.`REGINFONAME`",
+    "name" : "REGINFONAME"
+  }, {
+    "expression" : "t1.`SCORES`",
+    "name" : "SCORES"
+  }, {
+    "expression" : "t1.`STUDENTID`",
+    "name" : "STUDENTID"
+  }, {
+    "expression" : "t1.`STUNO`",
+    "name" : "STUNO"
+  }, {
+    "expression" : "t1.`SUBJECTS`",
+    "name" : "SUBJECTS"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`ADDRESS`,\nt1.`AGE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPARTMENT`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`NAME`,\nt1.`ORGID`,\nt1.`REGINFOID`,\nt1.`REGINFONAME`,\nt1.`SCORES`,\nt1.`STUDENTID`,\nt1.`STUNO`,\nt1.`SUBJECTS`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_REGINFO` t1 \n",
+  "rTMOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdedataqueries/DATAQUERY2/psdedqcodes/MYSQL5",
+  "id" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/DataQuery2/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json
@@ -295,6 +295,43 @@
    "noServiceCodeName" : true
  } ],
  "getAllPSAppDEDataSets" : [ {
+    "codeName" : "FetchDataQuery2",
+    "methodType" : "FETCH",
+    "name" : "FetchDataQuery2",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "DataQuery2"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchDataQuery2"
+    },
+    "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Reginfo/psappdemethods/FetchDataQuery2",
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchdataquery2",
+    "builtinMethod" : false
+  }, {
    "codeName" : "FetchDataSet2",
    "methodType" : "FETCH",
    "name" : "FetchDataSet2",
@@ -1588,6 +1625,43 @@
    "builtinMethod" : false,
    "needResourceKey" : true,
    "noServiceCodeName" : true
+  }, {
+    "codeName" : "FetchDataQuery2",
+    "methodType" : "FETCH",
+    "name" : "FetchDataQuery2",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "DataQuery2"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchDataQuery2"
+    },
+    "rTMOSFilePath" : "pssysapps/TemplatePublish/psappdataentities/Reginfo/psappdemethods/FetchDataQuery2",
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchdataquery2",
+    "builtinMethod" : false
  }, {
    "codeName" : "FetchDataSet2",
    "methodType" : "FETCH",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json
@@ -295,6 +295,43 @@
    "noServiceCodeName" : true
  } ],
  "getAllPSAppDEDataSets" : [ {
+    "codeName" : "FetchDataQuery2",
+    "methodType" : "FETCH",
+    "name" : "FetchDataQuery2",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "DataQuery2"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchDataQuery2"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdemethods/FetchDataQuery2",
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchdataquery2",
+    "builtinMethod" : false
+  }, {
    "codeName" : "FetchDataSet2",
    "methodType" : "FETCH",
    "name" : "FetchDataSet2",
@@ -1588,6 +1625,43 @@
    "builtinMethod" : false,
    "needResourceKey" : true,
    "noServiceCodeName" : true
+  }, {
+    "codeName" : "FetchDataQuery2",
+    "methodType" : "FETCH",
+    "name" : "FetchDataQuery2",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "ReginfoDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "DataQuery2"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchDataQuery2"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdemethods/FetchDataQuery2",
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchdataquery2",
+    "builtinMethod" : false
  }, {
    "codeName" : "FetchDataSet2",
    "methodType" : "FETCH",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json
@@ -24,10 +24,10 @@
  } ],
  "getPSChartDataSetGroups" : [ {
    "index" : 0,
-    "name" : "DEFAULT",
+    "name" : "DATAQUERY2",
    "getPSAppDEDataSet" : {
      "modelref" : true,
-      "id" : "FetchDefault"
+      "id" : "FetchDataQuery2"
    },
    "getPSAppDataEntity" : {
      "modelref" : true,
@@ -37,7 +37,7 @@
  } ],
  "getPSChartDataSets" : [ {
    "index" : 0,
-    "name" : "funnel_0-DEFAULT",
+    "name" : "funnel_0-DATAQUERY2",
    "getPSChartDataSetFields" : [ {
      "index" : 0,
      "name" : "NAME",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json
@@ -229,10 +229,10 @@
    } ],
    "getPSChartDataSetGroups" : [ {
      "index" : 0,
-      "name" : "DEFAULT",
+      "name" : "DATAQUERY2",
      "getPSAppDEDataSet" : {
        "modelref" : true,
-        "id" : "FetchDefault"
+        "id" : "FetchDataQuery2"
      },
      "getPSAppDataEntity" : {
        "modelref" : true,
@@ -242,7 +242,7 @@
    } ],
    "getPSChartDataSets" : [ {
      "index" : 0,
-      "name" : "funnel_0-DEFAULT",
+      "name" : "funnel_0-DATAQUERY2",
      "getPSChartDataSetFields" : [ {
        "index" : 0,
        "name" : "NAME",
@@ -318,7 +318,7 @@
        "name" : "fetch",
        "getPSAppDEMethod" : {
          "modelref" : true,
-          "id" : "FetchDefault"
+          "id" : "FetchDataQuery2"
        },
        "getPSAppDataEntity" : {
          "modelref" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
@@ -1001,6 +1001,36 @@
      "requestPath" : "/save",
      "uniqueTag" : "REGINFO__DEACTION__SAVE",
      "needResourceKey" : true
+    }, {
+      "codeName" : "FetchDataQuery2",
+      "dataAccessAction" : "READ",
+      "methodType" : "FETCH",
+      "name" : "FetchDataQuery2",
+      "getPSDEDataSet" : {
+        "modelref" : true,
+        "id" : "DataQuery2"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "ReginfoFilterDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "ReginfoDTO"
+        },
+        "type" : "PAGE"
+      },
+      "rTMOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Reginfo/psdesadetails/FetchDataQuery2",
+      "requestMethod" : "POST",
+      "requestParamType" : "ENTITY",
+      "requestPath" : "/fetchdataquery2",
+      "uniqueTag" : "REGINFO__FETCH__DATAQUERY2"
    }, {
      "codeName" : "FetchDataSet2",
      "dataAccessAction" : "READ",