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

app_Web/app/packages/ibiz-service/src/entities/book/book-base.ts

@@ -65,6 +65,10 @@ export abstract class BookBase extends EntityBase implements IBook {
      * 组织部门标识
      */
     deptid?: any;
+    /**
+     * 类型
+     */
+    type?: any;
 
     /**
      * 重置实体数据

app_Web/app/packages/ibiz-service/src/entities/book/book-dto-help.ts

@@ -44,6 +44,8 @@ export class BookDTOHelp {
         _data.deptid = source.deptid;
         // 组织机构标识
         _data.orgid = source.orgid;
+        // 类型
+        _data.type = source.type;
         // 更新时间
         _data.updatedate = source.updatedate;
         // 更新人
@@ -101,6 +103,8 @@ export class BookDTOHelp {
         _data.deptid = source.deptid;
         // 组织机构标识
         _data.orgid = source.orgid;
+        // 类型
+        _data.type = source.type;
         // 更新时间
         _data.updatedate = source.updatedate;
         // 更新人

app_Web/app/packages/ibiz-service/src/entities/book/book-keys.ts

@@ -7,4 +7,5 @@ export default [
     'bookid',
     'orgid',
     'deptid',
+    'type',
 ];

app_Web/app/packages/ibiz-service/src/entities/interface/ibook.ts

@@ -40,4 +40,8 @@ export interface IBook extends IEntityBase {
      * 组织部门标识
      */
     deptid?: any;
+    /**
+     * 类型
+     */
+    type?: any;
 }

trainsys-core/src/main/resources/liquibase/cn/ibizlab/trainsys/DEFAULT/h2_table.xml

@@ -17,6 +17,8 @@
             </column>
             <column name="ORGID" remarks="组织机构标识" type="VARCHAR(60)">
             </column>
+            <column name="TYPE" remarks="类型" type="VARCHAR(100)">
+            </column>
             <column name="UPDATEDATE" remarks="更新时间" type="DATETIME">
             </column>
             <column name="UPDATEMAN" remarks="更新人" type="VARCHAR(60)">

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

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-11-1">
+    <changeSet author="root" id="tab-book-15-1">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -21,6 +21,8 @@
                 </column>
                 <column name="DEPTID" remarks="" type="VARCHAR(60)">
                 </column>
+                <column name="TYPE" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 

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

@@ -207,6 +207,9 @@
     }, {
       "name" : "DEPTID",
       "codeName" : "DeptId"
+    }, {
+      "name" : "TYPE",
+      "codeName" : "Type"
     } ],
     "codeName" : "Table",
     "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json",
@@ -1057,6 +1060,82 @@
     "stdDataType" : 25,
     "stringLength" : 60,
     "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "TYPE",
+      "dBType" : "MYSQL5",
+      "name" : "TYPE",
+      "queryCodeExp" : "t1.`TYPE`",
+      "standardColumnName" : "`TYPE`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TYPE",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "Type",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "TYPE"
+    },
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BookDTO",
@@ -1130,6 +1209,17 @@
       "stdDataType" : 25,
       "stringLength" : 60,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "类型",
+      "name" : "Type",
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "更新时间",
       "name" : "UpdateDate",

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

@@ -19,6 +19,9 @@
   }, {
     "expression" : "t1.`ORGID`",
     "name" : "ORGID"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -26,6 +29,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "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

@@ -19,6 +19,9 @@
   }, {
     "expression" : "t1.`ORGID`",
     "name" : "ORGID"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -26,6 +29,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "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/Web/PSAPPDATAENTITIES/Book.json

@@ -277,6 +277,12 @@
     "name" : "DEPTID",
     "stdDataType" : 25,
     "stringLength" : 60
+  }, {
+    "codeName" : "Type",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BookDTO",
@@ -356,6 +362,18 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Type",
+      "logicName" : "类型",
+      "name" : "Type",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "UpdateDate",
       "logicName" : "更新时间",

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

@@ -85,6 +85,13 @@
       "name" : "BOOKNAME",
       "codeName" : "BookName"
     }
+  }, {
+    "id" : "type",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "Type"
+    }
   }, {
     "id" : "createman",
     "dataType" : 25,
@@ -162,6 +169,33 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "caption" : "类型",
+        "codeName" : "type",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "type",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TYPE",
+          "codeName" : "Type"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "maxLength" : 100,
+          "name" : "type"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "columnCount" : 24,

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

@@ -81,6 +81,23 @@
     "width" : 150,
     "widthUnit" : "PX",
     "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "类型",
+    "codeName" : "type",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "type",
+    "excelCaption" : "类型",
+    "name" : "type",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "Type"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
   } ],
   "getPSDEGridDataItems" : [ {
     "dataType" : 25,
@@ -104,6 +121,13 @@
       "name" : "UPDATEDATE",
       "codeName" : "UpdateDate"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "Type"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfkey",

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

@@ -1071,6 +1071,13 @@
         "name" : "BOOKNAME",
         "codeName" : "BookName"
       }
+    }, {
+      "id" : "type",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
     }, {
       "id" : "createman",
       "dataType" : 25,
@@ -1148,6 +1155,33 @@
           },
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "caption" : "类型",
+          "codeName" : "type",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "type",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "type"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "columnCount" : 24,

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

@@ -511,6 +511,23 @@
       "width" : 150,
       "widthUnit" : "PX",
       "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "类型",
+      "codeName" : "type",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "type",
+      "excelCaption" : "类型",
+      "name" : "type",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
@@ -534,6 +551,13 @@
         "name" : "UPDATEDATE",
         "codeName" : "UpdateDate"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "type",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -2540,6 +2540,23 @@
           "width" : 150,
           "widthUnit" : "PX",
           "enableSort" : true
+        }, {
+          "align" : "LEFT",
+          "cLConvertMode" : "NONE",
+          "caption" : "类型",
+          "codeName" : "type",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "type",
+          "excelCaption" : "类型",
+          "name" : "type",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          },
+          "width" : 100,
+          "widthUnit" : "PX",
+          "enableSort" : true
         } ],
         "getPSDEGridDataItems" : [ {
           "dataType" : 25,
@@ -2563,6 +2580,13 @@
             "name" : "UPDATEDATE",
             "codeName" : "UpdateDate"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "type",
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          }
         }, {
           "dataType" : 25,
           "name" : "srfkey",
@@ -4257,6 +4281,12 @@
         "name" : "DEPTID",
         "stdDataType" : 25,
         "stringLength" : 60
+      }, {
+        "codeName" : "Type",
+        "logicName" : "类型",
+        "name" : "TYPE",
+        "stdDataType" : 25,
+        "stringLength" : 100
       } ],
       "getAllPSAppDEMethodDTOs" : [ {
         "codeName" : "BookDTO",
@@ -4336,6 +4366,18 @@
           "sourceType" : "DEFIELD",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "Type",
+          "logicName" : "类型",
+          "name" : "Type",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "UpdateDate",
           "logicName" : "更新时间",

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

@@ -42,6 +42,13 @@
       "name" : "ORGID",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "TYPE",
+      "length" : 100,
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "UPDATEDATE",
       "length" : 8,