1.使用登记、安装告知增加作废3字段，作废原因、作废日期、作废人员id

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -126,13 +126,13 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "流程建议")
     private String processAdvice;
 
-    @ApiModelProperty(value = "撤销原由")
+    @ApiModelProperty(value = "作废原因")
     private String cancelReason;
 
-    @ApiModelProperty(value = "撤销说明")
+    @ApiModelProperty(value = "撤销说明-未使用")
     private String cancelRemark;
 
-    @ApiModelProperty(value = "撤销处理截止日期")
+    @ApiModelProperty(value = "撤销日期-未使用")
     private Date cancelHandleDeadline;
 
     @ApiModelProperty(value = "撤销流水号")
@@ -299,4 +299,13 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "设备类别")
     private String equipCategory;
 
+
+    @ApiModelProperty(value = "作废人员id")
+    private String cancelUserId;
+
+
+    @ApiModelProperty(value = "作废日期")
+    private Date cancelDate;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

@@ -134,4 +134,17 @@ public class JgUseRegistrationDto extends BaseDto {
 
     @ApiModelProperty(value = "接收单位")
     private String receiveCompanyCode;
+
+
+    @ApiModelProperty(value = "作废人员id")
+    private String cancelUserId;
+
+
+    @ApiModelProperty(value = "作废原因")
+    private String cancelReason;
+
+
+    @ApiModelProperty(value = "作废日期")
+    private Date cancelDate;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -225,7 +225,7 @@ public class JgInstallationNotice extends BaseEntity {
     private String processAdvice;
 
     /**
-     * 撤销原由
+     * 作废原因
      */
     @TableField("cancel_reason")
     private String cancelReason;
@@ -459,4 +459,16 @@ public class JgInstallationNotice extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 作废日期
+     */
+    @TableField("cancel_date")
+    private Date cancelDate;
+
+    /**
+     * 作废人员id
+     */
+    @TableField("cancel_user_id")
+    private String cancelUserId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -210,4 +210,23 @@ public class JgUseRegistration extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 作废日期
+     */
+    @TableField("cancel_date")
+    private Date cancelDate;
+
+    /**
+     * 作废人员id
+     */
+    @TableField("cancel_user_id")
+    private String cancelUserId;
+
+
+    /**
+     * 作废原因
+     */
+    @TableField("cancel_reason")
+    private String cancelReason;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -562,7 +563,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
             this.updateRedisBatch(list);
             return list;
-        } catch (BadRequest e) {
+        } catch (BadRequest | LocalBadRequest e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
             throw e;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -29,6 +29,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -500,7 +501,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 commonServiceImpl.buildTaskModel(list);
             }
             return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
-        } catch (BadRequest e) {
+        } catch (BadRequest | LocalBadRequest e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
             throw e;
@@ -692,7 +693,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 设备数据存历史数据，在流程完成时使用
             updateHistory(map, null, String.valueOf(useRegistration.getSequenceNbr()), useRegistration.getSupervisoryCode());
             return this.baseMapper.getDetailById(useRegistration.getSequenceNbr());
-        } catch (BadRequest e) {
+        } catch (BadRequest | LocalBadRequest e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
             throw e;