diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java index 1c560840a..58f61e4f2 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java @@ -159,6 +159,12 @@ public class SysWorkplaceDocumentEntity { @TableField(value = "number") private Integer number; + /** + * 是否常用: 1常用;0:不常用 + */ + @TableField(value = "isPopular") + private Integer isPopular; + } diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java index e964ece7a..e3e16ffa7 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java @@ -137,6 +137,7 @@ public class SysWorkplaceDocumentResponse { private Integer orderFinishVerify; private Integer number; + private Integer isPopular; public String getThrBusName() { diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 97acd671e..26c344586 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -19,11 +19,10 @@ ico.tagStatus, ico.splitStatus, ico.invAlert, - ico.splitMsg - , + ico.splitMsg, + ico.fromCorpName, ico.tagMsg, sys_workplace_document.busName busTypeName, - bc.name fromCorpName, sw.workplaceName, ico.id, ico.orderTime, diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 67fed57d4..112226600 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4363,6 +4363,11 @@ CALL Pro_Temp_ColumnWork('sys_workplace_document', 'orderFinishVerify', 1); +CALL Pro_Temp_ColumnWork('sys_workplace_document', 'isPopular', + ' tinyint NULL DEFAULT NULL COMMENT ''是否常用:0:否;1是''', + 1); + + CALL Pro_Temp_ColumnWork('sys_workplace_document', 'number', 'int NULL DEFAULT NULL COMMENT ''顺序号''', 1);