diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c9eeb8b..3d72bed 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-common - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c9eeb8b..3d72bed 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-common - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index 4a5d3b1..cf2639d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -441,8 +441,13 @@ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(processId) .singleResult(); - String startUserId = historicProcessInstance.getStartUserId(); - User user = userMapper.selectById(Long.valueOf(startUserId)); + String startUserId = null; + User user = null; + if(ObjectUtil.isNotEmpty(historicProcessInstance)){ + startUserId = historicProcessInstance.getStartUserId(); + user = userMapper.selectById(Long.valueOf(startUserId)); + } + HistoricVariableInstance reason = historyService.createHistoricVariableInstanceQuery().processInstanceId(processId).variableName("reason").singleResult(); if (ObjectUtil.isNotEmpty(reason) && ObjectUtil.isNotEmpty(reason.getValue())) { @@ -467,10 +472,11 @@ for (ApprovalLogResponse approvalLog : approvalLogList) { if (approvalLog.getTaskId().contains("root")) { - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + approvalLog.setApprovalStatus(approvalLog.getTaskName());//发起人 if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); @@ -484,8 +490,9 @@ if (ObjectUtil.isNotEmpty(approvalLog.getComment()) && "4".equals(approvalLog.getComment().getType())) { cancel = true; - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c9eeb8b..3d72bed 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-common - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index 4a5d3b1..cf2639d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -441,8 +441,13 @@ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(processId) .singleResult(); - String startUserId = historicProcessInstance.getStartUserId(); - User user = userMapper.selectById(Long.valueOf(startUserId)); + String startUserId = null; + User user = null; + if(ObjectUtil.isNotEmpty(historicProcessInstance)){ + startUserId = historicProcessInstance.getStartUserId(); + user = userMapper.selectById(Long.valueOf(startUserId)); + } + HistoricVariableInstance reason = historyService.createHistoricVariableInstanceQuery().processInstanceId(processId).variableName("reason").singleResult(); if (ObjectUtil.isNotEmpty(reason) && ObjectUtil.isNotEmpty(reason.getValue())) { @@ -467,10 +472,11 @@ for (ApprovalLogResponse approvalLog : approvalLogList) { if (approvalLog.getTaskId().contains("root")) { - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + approvalLog.setApprovalStatus(approvalLog.getTaskName());//发起人 if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); @@ -484,8 +490,9 @@ if (ObjectUtil.isNotEmpty(approvalLog.getComment()) && "4".equals(approvalLog.getComment().getType())) { cancel = true; - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index e7996cf..dc442af 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -70,6 +70,7 @@ import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -1067,4 +1068,11 @@ } return fieldValue; } + + @Override + public EquipmentInfo getById(Serializable id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",id); + return this.getOne(queryWrapper); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c9eeb8b..3d72bed 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-common - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index 4a5d3b1..cf2639d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -441,8 +441,13 @@ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(processId) .singleResult(); - String startUserId = historicProcessInstance.getStartUserId(); - User user = userMapper.selectById(Long.valueOf(startUserId)); + String startUserId = null; + User user = null; + if(ObjectUtil.isNotEmpty(historicProcessInstance)){ + startUserId = historicProcessInstance.getStartUserId(); + user = userMapper.selectById(Long.valueOf(startUserId)); + } + HistoricVariableInstance reason = historyService.createHistoricVariableInstanceQuery().processInstanceId(processId).variableName("reason").singleResult(); if (ObjectUtil.isNotEmpty(reason) && ObjectUtil.isNotEmpty(reason.getValue())) { @@ -467,10 +472,11 @@ for (ApprovalLogResponse approvalLog : approvalLogList) { if (approvalLog.getTaskId().contains("root")) { - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + approvalLog.setApprovalStatus(approvalLog.getTaskName());//发起人 if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); @@ -484,8 +490,9 @@ if (ObjectUtil.isNotEmpty(approvalLog.getComment()) && "4".equals(approvalLog.getComment().getType())) { cancel = true; - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index e7996cf..dc442af 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -70,6 +70,7 @@ import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -1067,4 +1068,11 @@ } return fieldValue; } + + @Override + public EquipmentInfo getById(Serializable id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",id); + return this.getOne(queryWrapper); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java index b7368aa..4b519a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java @@ -84,6 +84,8 @@ AuthUser authUser = permissionContext.getAuthService().getLoginUser(); suggestForm.setApproveUserId(authUser.getId()); suggestForm.setApproveUserName(authUser.getName()); + this.updateById(suggestForm); + BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm(); BeanUtil.copyProperties(suggestForm,bizSuggestForm); bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime())); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c9eeb8b..3d72bed 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-common - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index 4a5d3b1..cf2639d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -441,8 +441,13 @@ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(processId) .singleResult(); - String startUserId = historicProcessInstance.getStartUserId(); - User user = userMapper.selectById(Long.valueOf(startUserId)); + String startUserId = null; + User user = null; + if(ObjectUtil.isNotEmpty(historicProcessInstance)){ + startUserId = historicProcessInstance.getStartUserId(); + user = userMapper.selectById(Long.valueOf(startUserId)); + } + HistoricVariableInstance reason = historyService.createHistoricVariableInstanceQuery().processInstanceId(processId).variableName("reason").singleResult(); if (ObjectUtil.isNotEmpty(reason) && ObjectUtil.isNotEmpty(reason.getValue())) { @@ -467,10 +472,11 @@ for (ApprovalLogResponse approvalLog : approvalLogList) { if (approvalLog.getTaskId().contains("root")) { - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + approvalLog.setApprovalStatus(approvalLog.getTaskName());//发起人 if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); @@ -484,8 +490,9 @@ if (ObjectUtil.isNotEmpty(approvalLog.getComment()) && "4".equals(approvalLog.getComment().getType())) { cancel = true; - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index e7996cf..dc442af 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -70,6 +70,7 @@ import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -1067,4 +1068,11 @@ } return fieldValue; } + + @Override + public EquipmentInfo getById(Serializable id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",id); + return this.getOne(queryWrapper); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java index b7368aa..4b519a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java @@ -84,6 +84,8 @@ AuthUser authUser = permissionContext.getAuthService().getLoginUser(); suggestForm.setApproveUserId(authUser.getId()); suggestForm.setApproveUserName(authUser.getName()); + this.updateById(suggestForm); + BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm(); BeanUtil.copyProperties(suggestForm,bizSuggestForm); bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index cd908f4..cf3cea5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -168,9 +168,12 @@ approval.setAttachments(attachmentService.selectByEquipment(approval.getEquipmentId())); if(DELAY.equals(approval.getApprovalType())){ - EquipmentQueryForm queryForm = new EquipmentQueryForm(); - queryForm.setIds(relationService.selectEquipmentIdsByApproval(approvalId)); - approval.setEquipmentInfos(equipmentInfoService.list(queryForm)); + List equipmentIds = relationService.selectEquipmentIdsByApproval(approvalId); + if(CollUtil.isNotEmpty(equipmentIds)){ + EquipmentQueryForm queryForm = new EquipmentQueryForm(); + queryForm.setIds(equipmentIds); + approval.setEquipmentInfos(equipmentInfoService.list(queryForm)); + } }else { EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId()); equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId())); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c9eeb8b..3d72bed 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-common - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index 4a5d3b1..cf2639d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -441,8 +441,13 @@ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(processId) .singleResult(); - String startUserId = historicProcessInstance.getStartUserId(); - User user = userMapper.selectById(Long.valueOf(startUserId)); + String startUserId = null; + User user = null; + if(ObjectUtil.isNotEmpty(historicProcessInstance)){ + startUserId = historicProcessInstance.getStartUserId(); + user = userMapper.selectById(Long.valueOf(startUserId)); + } + HistoricVariableInstance reason = historyService.createHistoricVariableInstanceQuery().processInstanceId(processId).variableName("reason").singleResult(); if (ObjectUtil.isNotEmpty(reason) && ObjectUtil.isNotEmpty(reason.getValue())) { @@ -467,10 +472,11 @@ for (ApprovalLogResponse approvalLog : approvalLogList) { if (approvalLog.getTaskId().contains("root")) { - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + approvalLog.setApprovalStatus(approvalLog.getTaskName());//发起人 if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); @@ -484,8 +490,9 @@ if (ObjectUtil.isNotEmpty(approvalLog.getComment()) && "4".equals(approvalLog.getComment().getType())) { cancel = true; - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index e7996cf..dc442af 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -70,6 +70,7 @@ import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -1067,4 +1068,11 @@ } return fieldValue; } + + @Override + public EquipmentInfo getById(Serializable id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",id); + return this.getOne(queryWrapper); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java index b7368aa..4b519a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java @@ -84,6 +84,8 @@ AuthUser authUser = permissionContext.getAuthService().getLoginUser(); suggestForm.setApproveUserId(authUser.getId()); suggestForm.setApproveUserName(authUser.getName()); + this.updateById(suggestForm); + BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm(); BeanUtil.copyProperties(suggestForm,bizSuggestForm); bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index cd908f4..cf3cea5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -168,9 +168,12 @@ approval.setAttachments(attachmentService.selectByEquipment(approval.getEquipmentId())); if(DELAY.equals(approval.getApprovalType())){ - EquipmentQueryForm queryForm = new EquipmentQueryForm(); - queryForm.setIds(relationService.selectEquipmentIdsByApproval(approvalId)); - approval.setEquipmentInfos(equipmentInfoService.list(queryForm)); + List equipmentIds = relationService.selectEquipmentIdsByApproval(approvalId); + if(CollUtil.isNotEmpty(equipmentIds)){ + EquipmentQueryForm queryForm = new EquipmentQueryForm(); + queryForm.setIds(equipmentIds); + approval.setEquipmentInfos(equipmentInfoService.list(queryForm)); + } }else { EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId()); equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java index 86cfabe..884d417 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java @@ -12,6 +12,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -50,6 +52,10 @@ @Override public List selectEquipmentIdsByApproval(Long approvalId) { - return null; + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("approval_id",approvalId); + wrapper.select("equipment_id"); + List> resMap = this.listMaps(wrapper); + return resMap.stream().map(i->Long.parseLong(i.get("equipment_id").toString())).distinct().collect(Collectors.toList()); } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 220c4d4..74da3d5 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 5eb08fa..3992e23 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index c245073..eb329cb 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-job - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 71699c6..a8037f3 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.1.0 + 1.3.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6c940aa..2d62d25 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 2a08051..ebb18d9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -55,6 +55,8 @@ String RFID_USAGE_STATUS = DICT_PREFIX + "RfidUsageStatus"; + String HANDLE_STATUS = "handleStatus"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java index ca90f77..0884afc 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerSuggestForm.java @@ -169,4 +169,21 @@ @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty("（受检系统）审核人id") + @TableField("approve_user_id") + private Long approveUserId; + + @ApiModelProperty("受检系统）审核人姓名") + @TableField("approve_user_name") + private String approveUserName; + + @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") + @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) + private String handleStatus; + + @ApiModelProperty("处置情况名称") + @TableField(exist = false) + private String handleStatusName; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java index cf8510c..81064c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/EqptResourceCustomerSuggestForm.java @@ -168,6 +168,7 @@ @ApiModelProperty("处置情况（0未处置；1处置中；2已处置）") @TableField("handle_status") + @DictCodeField(cacheName = MeterDictCode.HANDLE_STATUS) private String handleStatus; @ApiModelProperty("处置情况名称") diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c9eeb8b..3d72bed 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.1.0 + 1.3.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-model - 1.3.1.0 + 1.3.1.1 com.casic casic-metering-common - 1.3.1.0 + 1.3.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index 4a5d3b1..cf2639d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -441,8 +441,13 @@ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(processId) .singleResult(); - String startUserId = historicProcessInstance.getStartUserId(); - User user = userMapper.selectById(Long.valueOf(startUserId)); + String startUserId = null; + User user = null; + if(ObjectUtil.isNotEmpty(historicProcessInstance)){ + startUserId = historicProcessInstance.getStartUserId(); + user = userMapper.selectById(Long.valueOf(startUserId)); + } + HistoricVariableInstance reason = historyService.createHistoricVariableInstanceQuery().processInstanceId(processId).variableName("reason").singleResult(); if (ObjectUtil.isNotEmpty(reason) && ObjectUtil.isNotEmpty(reason.getValue())) { @@ -467,10 +472,11 @@ for (ApprovalLogResponse approvalLog : approvalLogList) { if (approvalLog.getTaskId().contains("root")) { - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + approvalLog.setApprovalStatus(approvalLog.getTaskName());//发起人 if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); @@ -484,8 +490,9 @@ if (ObjectUtil.isNotEmpty(approvalLog.getComment()) && "4".equals(approvalLog.getComment().getType())) { cancel = true; - approvalLog.setAssigneeId(Long.valueOf(startUserId)); + if (!Objects.isNull(user)) { + approvalLog.setAssigneeId(Long.valueOf(startUserId)); approvalLog.setAssigneeName(user.getName()); Dept dept = deptMapper.selectById(user.getDeptId()); approvalLog.setDeptId(user.getDeptId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index e7996cf..dc442af 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -70,6 +70,7 @@ import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -1067,4 +1068,11 @@ } return fieldValue; } + + @Override + public EquipmentInfo getById(Serializable id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",id); + return this.getOne(queryWrapper); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java index b7368aa..4b519a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/EqptResourceCustomerSuggestFormServiceImpl.java @@ -84,6 +84,8 @@ AuthUser authUser = permissionContext.getAuthService().getLoginUser(); suggestForm.setApproveUserId(authUser.getId()); suggestForm.setApproveUserName(authUser.getName()); + this.updateById(suggestForm); + BizResourceCustomerSuggestForm bizSuggestForm = new BizResourceCustomerSuggestForm(); BeanUtil.copyProperties(suggestForm,bizSuggestForm); bizSuggestForm.setCreateTime(DateUtil.formatDateTime(suggestForm.getCreateTime())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java index cd908f4..cf3cea5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java @@ -168,9 +168,12 @@ approval.setAttachments(attachmentService.selectByEquipment(approval.getEquipmentId())); if(DELAY.equals(approval.getApprovalType())){ - EquipmentQueryForm queryForm = new EquipmentQueryForm(); - queryForm.setIds(relationService.selectEquipmentIdsByApproval(approvalId)); - approval.setEquipmentInfos(equipmentInfoService.list(queryForm)); + List equipmentIds = relationService.selectEquipmentIdsByApproval(approvalId); + if(CollUtil.isNotEmpty(equipmentIds)){ + EquipmentQueryForm queryForm = new EquipmentQueryForm(); + queryForm.setIds(equipmentIds); + approval.setEquipmentInfos(equipmentInfoService.list(queryForm)); + } }else { EquipmentInfo equipmentInfo = equipmentInfoService.getById(approval.getEquipmentId()); equipmentInfo.setCompanyName(permissionContext.getDeptService().getDeptName(equipmentInfo.getCompanyId())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java index 86cfabe..884d417 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java @@ -12,6 +12,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -50,6 +52,10 @@ @Override public List selectEquipmentIdsByApproval(Long approvalId) { - return null; + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("approval_id",approvalId); + wrapper.select("equipment_id"); + List> resMap = this.listMaps(wrapper); + return resMap.stream().map(i->Long.parseLong(i.get("equipment_id").toString())).distinct().collect(Collectors.toList()); } } diff --git a/pom.xml b/pom.xml index 026c482..3c80949 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.3.1.0 + 1.3.1.1 casic-metering-eqpt-xichang pom