diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 73c3fdb3e..fc0378343 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -217,5 +217,19 @@ public class IoCollectOrder implements Serializable { private Integer invAlert; @TableField(exist = false) private List collectOrderBizResponseList; + + + /** + *上传状态(1.未上传,2.已上传,3.上传失败) + */ + @TableField(value = "uploadStatus") + private Integer uploadStatus; + + /** + *上传错误信息 + */ + @TableField(value = "uploadError") + private String uploadError; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index 962d592b1..ed1854132 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -115,5 +115,14 @@ public class CollectOrderRequest extends ListPageRequest { private Integer invAlert; private List invAlerts; + /** + *上传状态(1.未上传,2.已上传,3.上传失败) + */ + private Integer uploadStatus; + + /** + *上传错误信息 + */ + private String updateError; } diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index 5934bc64c..edac10b22 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -154,6 +154,16 @@ public class IoCollectOrderResponse { @TableField(value = "invAlert") private Integer invAlert; + /** + *上传状态(1.未上传,2.已上传,3.上传失败) + */ + private Integer uploadStatus; + + /** + *上传错误信息 + */ + private String uploadError; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index ba1de01d7..37bc57986 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -28,6 +28,8 @@ sw.workplaceName, ico.id, ico.orderTime, + ico.uploadStatus, + ico.uploadError, row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence FROM io_collect_order ico left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 1b7028bfd..ca256efdf 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4310,4 +4310,12 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'autoCode', 1); CALL Pro_Temp_ColumnWork('sys_workplace_document', 'autoTag', ' tinyint NULL DEFAULT b''0'' COMMENT ''管理设备(是否自动赋码):: 1:是; 0:否''', - 1); \ No newline at end of file + 1); + +CALL Pro_Temp_ColumnWork('io_collect_order', 'uploadStatus', + ' tinyint NULL DEFAULT 1 COMMENT ''上传状态(1.未上传,2.已上传,3.上传失败)''', + 1); + +CALL Pro_Temp_ColumnWork('io_collect_order', 'uploadError', + ' varchar(1024) NULL COMMENT ''上传错误信息''', + 1);