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

d5f9c2e9 · ibizdev · 8ed779fe · d5f9c2e9 · d5f9c2e9 · d5f9c2e9
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
@@ -523,14 +523,14 @@
        "condType" : "GROUP",
        "name" : "连接条件",
        "getPSDEDQConditions" : [ {
-          "condOp" : "EQ",
+          "condOp" : "GT",
          "condType" : "SINGLE",
          "condValue" : "name",
-          "fieldName" : "BOOKNAME",
-          "name" : "BOOKNAME 等于(=) 网页请求上下文(name)",
+          "fieldName" : "FIELD45",
+          "name" : "(FIELD45) 大于(>) 网页请求上下文 name",
          "getPSDEField" : {
-            "name" : "BOOKNAME",
-            "codeName" : "BookName"
+            "name" : "FIELD45",
+            "codeName" : "FIELD45"
          },
          "getPSVARTypeId" : "WEBCONTEXT",
          "ignoreEmpty" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
@@ -3,7 +3,7 @@
  "name" : "MySQL5",
  "getPSDEDataQueryCodeConds" : [ {
    "condType" : "CUSTOM",
-    "customCond" : "( <choose><when test=\"ctx.webcontext.name !=null \">  t1.`BOOKNAME` = #{ctx.webcontext.name}  </when><otherwise>1=1</otherwise></choose>  AND  t1.`FIELD45` > 111111 )",
+    "customCond" : "( <choose><when test=\"ctx.webcontext.name !=null \">  t1.`FIELD45` <![CDATA[>]]> #{ctx.webcontext.name}  </when><otherwise>1=1</otherwise></choose>  AND  t1.`FIELD45` > 111111 )",
    "name" : "查询条件"
  } ],
  "getPSDEDataQueryCodeExps" : [ {

--- 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
@@ -2648,6 +2648,12 @@
    "name" : "雷达图",
    "realModelSubType" : "DECHARTVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr2DataView",
+    "logicName" : "学员登记信息实体数据视图(2)",
+    "name" : "学员登记信息实体数据视图(2)",
+    "realModelSubType" : "DEDATAVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "PickupGridView",
    "logicName" : "学员登记信息实体选择表格视图（部件视图）",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1049,16 +1049,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ]
  }, {

--- 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
@@ -1834,6 +1834,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301140652ChartView.json",
    "viewType" : "DECHARTVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2DataView.json",
+    "viewType" : "DEDATAVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoDataView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSDATAVIEWS/TestCard2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSDATAVIEWS/TestCard2.json
+{
+  "codeName" : "TestCard2",
+  "controlType" : "DATAVIEW",
+  "getCreatePSControlAction" : {
+    "modelref" : true,
+    "id" : "create",
+    "actionName" : "Create",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "create",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Create"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSDATAVIEWS/TestCard2.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "getGetPSControlAction" : {
+    "modelref" : true,
+    "id" : "load",
+    "actionName" : "Get",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "READ",
+    "name" : "load",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "groupLayout" : "ROW",
+  "groupMode" : "AUTO",
+  "getGroupPSAppDEField" : {
+    "name" : "NAME",
+    "codeName" : "Name"
+  },
+  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+  "logicName" : "登记信息卡片2",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
+    "logicTag" : "dataview",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_dataview",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "getPSDEDataViewDataItems" : [ {
+    "dataType" : 25,
+    "name" : "name",
+    "getPSAppDEField" : {
+      "name" : "NAME",
+      "codeName" : "Name"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "reginfoname",
+    "getPSAppDEField" : {
+      "name" : "REGINFONAME",
+      "codeName" : "ReginfoName"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "REGINFOID",
+      "codeName" : "ReginfoId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "REGINFONAME",
+      "codeName" : "ReginfoName"
+    }
+  } ],
+  "getPSDEDataViewItems" : [ {
+    "caption" : "学员姓名",
+    "dataItemName" : "name",
+    "itemType" : "DATAITEM",
+    "name" : "NAME",
+    "getPSAppDEField" : {
+      "name" : "NAME",
+      "codeName" : "Name"
+    },
+    "enableSort" : true
+  }, {
+    "caption" : "学员登记信息名称",
+    "dataItemName" : "reginfoname",
+    "itemType" : "DATAITEM",
+    "name" : "REGINFONAME",
+    "getPSAppDEField" : {
+      "name" : "REGINFONAME",
+      "codeName" : "ReginfoName"
+    },
+    "enableSort" : true
+  } ],
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "modelref" : true,
+    "id" : "remove",
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "getUpdatePSControlAction" : {
+    "modelref" : true,
+    "id" : "update",
+    "actionName" : "Update",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "UPDATE",
+    "name" : "update",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Update"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "hasWFDataItems" : false,
+  "appendDEItems" : false,
+  "enableCardEdit" : false,
+  "enableCardEditGroup" : false,
+  "enableCardEditOrder" : false,
+  "enableCardNew" : false,
+  "enableGroup" : true,
+  "enablePagingBar" : true,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "2C182861-46D4-4B53-AC7F-A2C39224E94D",
+  "modeltype" : "PSDEDATAVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2DataView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
@@ -895,6 +895,28 @@
            "layout" : "TABLE_24COL"
          },
          "tooltip" : "书测试卡片视图"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "学员信息卡片视图2",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem67",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "AppFunc56"
+          },
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "学员信息卡片视图2"
        } ],
        "getPSLayout" : {
          "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
@@ -402,6 +402,16 @@
          "id" : "AppFunc32"
        },
        "tooltip" : "书测试卡片视图"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "学员信息卡片视图2",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem67",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc56"
+        },
+        "tooltip" : "学员信息卡片视图2"
      } ],
      "tooltip" : "卡片"
    }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -1294,6 +1294,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/cityGridView.json",
      "viewType" : "DEGRIDVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "AppFunc56",
+    "name" : "打开卡片视图2",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2DataView.json",
+      "viewType" : "DEDATAVIEW"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "AppFunc6",
@@ -2100,16 +2110,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ]
  } ],
@@ -2813,6 +2823,12 @@
    "viewType" : "DEMEDITVIEW9",
    "resource" : "Phone",
    "view" : "MEditView9"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2DataView.json",
+    "viewType" : "DEDATAVIEW",
+    "resource" : "Reginfo",
+    "view" : "Usr2DataView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTListView.json",
@@ -3953,6 +3969,28 @@
                "layout" : "TABLE_24COL"
              },
              "tooltip" : "书测试卡片视图"
+            }, {
+              "accUserMode" : 2,
+              "caption" : "学员信息卡片视图2",
+              "itemType" : "MENUITEM",
+              "name" : "menuitem67",
+              "getPSAppFunc" : {
+                "modelref" : true,
+                "id" : "AppFunc56"
+              },
+              "getPSLayout" : {
+                "childColLG" : -1,
+                "childColMD" : 24,
+                "childColSM" : -1,
+                "childColXS" : -1,
+                "columnCount" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "tooltip" : "学员信息卡片视图2"
            } ],
            "getPSLayout" : {
              "childColLG" : -1,