1.业务审批通过更新证时，更新证版本号及原因

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/CertInfoRequestParam.java

@@ -11,7 +11,7 @@ public class CertInfoRequestParam {
      * 唯一编号
      */
     @NotBlank(message = "证唯一标识不能为空！")
-    private String certSeq;
+    private String certNo;
 
     /**
      * 证类型：使用登记证、使用标志

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

@@ -26,7 +26,7 @@ public class CertDetailServiceImpl {
 
     public Map<String, Object> getCertInfoForWX(CertInfoRequestParam requestParam) {
         this.setDefaultVersionForOld(requestParam);
-        String certOrApplyNo = this.deCodeCertSeq(requestParam.getCertSeq());
+        String certOrApplyNo = this.deCodeCertNo(requestParam.getCertNo());
         String version = this.deCodeByAES(requestParam.getVersion());
         String certType = this.deCodeByAES(requestParam.getCertType());
         JgUseRegistrationManageDto jgUseRegistrationManage = this.checkParam(certOrApplyNo, version);
@@ -69,13 +69,13 @@ public class CertDetailServiceImpl {
         }
     }
 
-    private String deCodeCertSeq(@NotBlank(message = "证唯一标识不能为空！") String certSeq) {
+    private String deCodeCertNo(@NotBlank(message = "证唯一标识不能为空！") String certNo) {
         // 老数据兼容支持
-        if (certSeq.startsWith("SYDJ") || certSeq.startsWith("YZBG")) {
-            return certSeq;
+        if (certNo.startsWith("SYDJ") || certNo.startsWith("YZBG")) {
+            return certNo;
         }
         try {
-            return AESUtil.decrypt(certSeq);
+            return AESUtil.decrypt(certNo);
         } catch (Exception e) {
             throw new BadRequest("非法的二维码！");
         }

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/CommonServiceImpl.java

@@ -946,13 +946,13 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
-    private String getEncodeQrCode(String certSeq, String certType, String version) {
-        String certSeqEncrypt = AESUtil.encrypt(certSeq);
+    private String getEncodeQrCode(String certNo, String certType, String version) {
+        String certNoEncrypt = AESUtil.encrypt(certNo);
         String certTypeEncrypt = AESUtil.encrypt(certType);
         String versionEncrypt = AESUtil.encrypt(version);
         return qrcodePrefix +
-                "?certSeq=" +
-                certSeqEncrypt +
+                "?certNo=" +
+                certNoEncrypt +
                 "certType=" +
                 certTypeEncrypt +
                 "version=" +

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/JgChangeRegistrationNameServiceImpl.java

@@ -83,15 +83,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     RedisUtils redisUtils;
 
     @Autowired
-    JgChangeRegistrationNameMapper jgChangeRegistrationNameMapper;
-
-    @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
 
     @Autowired
-    WorkFlowFeignService workFlowFeignService;
-
-    @Autowired
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
     @Autowired
@@ -911,12 +905,15 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         if (!ObjectUtils.isEmpty(collect)) {
             LambdaQueryWrapper<JgUseRegistrationManage> lambda = new QueryWrapper<JgUseRegistrationManage>().lambda();
             lambda.in(JgUseRegistrationManage::getSequenceNbr, collect);
-            JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
+            List<JgUseRegistrationManage> manages = jgUseRegistrationManageService.list(lambda);
+            manages.forEach(jgUseRegistrationManage -> {
                 jgUseRegistrationManage.setUseUnitName(jgChangeRegistrationName.getNewUseUnitName());
                 jgUseRegistrationManage.setAuditPassDate(new Date());
-            jgUseRegistrationManageService.update(jgUseRegistrationManage, lambda);
+                jgUseRegistrationManage.setVersion(jgUseRegistrationManage.getVersion() + 1);
+                jgUseRegistrationManage.setChangeReason(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+            });
+            jgUseRegistrationManageService.updateBatchById(manages);
         }
-
         // 业务流水生成
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
                 .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr())

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/JgChangeRegistrationTransferServiceImpl.java

@@ -1009,6 +1009,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     registrationManageNew.setReceiveOrgName(transfer.getReceiveOrgName());
                     registrationManageNew.setReceiveCompanyCode(transfer.getReceiveOrgCode());
                     registrationManageNew.setAuditPassDate(new Date());
+                    registrationManageNew.setRegDate(new Date());
                     registrationManageNew.setEquUseAddress(transfer.getFullAddress());
 
                     // 更新使用登记码逻辑

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/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -428,8 +428,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
             lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
-            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
-            JSONObject historyData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             // 更新代办
             TaskV2Model taskV2Model = updateAgency(jgChangeVehicleRegistrationUnit);
             // 修改设备信息、添加证、设备流水信息
@@ -544,6 +542,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setUseUnitAddress(String.valueOf(enterpriseInfo.get("address")));
         // 新增新车牌号后，兼容老数据默认新车牌号 与 老的一致
         manage.setCarNumber(jgChangeVehicleRegistrationUnit.getNewCarNumber() != null ? jgChangeVehicleRegistrationUnit.getNewCarNumber() : jgChangeVehicleRegistrationUnit.getCarNumber());
+        manage.setVersion(manage.getVersion() + 1);
+        manage.setChangeReason(BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.getName());
         jgUseRegistrationManageService.updateById(manage);
         // 保存证流水信息
         jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());

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/JgScrapCancelServiceImpl.java

@@ -29,9 +29,7 @@ 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;
-import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
-import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
@@ -81,11 +79,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
 
     @Autowired
-    WorkFlowFeignService workFlowFeginService;
-    @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
-    @Autowired
-    IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
+
     @Autowired
     SuperviseInfoMapper superviseInfoMapper;
     @Autowired
@@ -95,12 +90,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     @Autowired
     RedisUtils redisUtils;
     @Autowired
-    IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
-    @Autowired
-    IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
-    @Autowired
-    private OtherInfoMapper otherInfoMapper;
-    @Autowired
     private JgScrapCancelEqServiceImpl jgScrapCancelEqService;
     @Autowired
     private JgScrapCancelEqMapper jgScrapCancelEqMapper;
@@ -1000,6 +989,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 //设置证状态进行修改
                 JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
                 jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
+                jgUseRegistrationManage.setVersion(jgUseRegistrationManage.getVersion() + 1);
+                jgUseRegistrationManage.setChangeReason(BusinessTypeEnum.JG_EQUIPMENT_CANCEL.getName());
                 jgUseRegistrationManage.setIsScrap("1");
                 jgUseRegistrationManageMapper.update(jgUseRegistrationManage, updateLambdaQueryWrapper);
             }
@@ -1018,7 +1009,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             LambdaUpdateWrapper<JgUseRegistrationManage> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.in(JgUseRegistrationManage::getSequenceNbr, jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getSequenceNbr).collect(Collectors.toList()));
             updateWrapper.set(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIZHUXIAO.getName());
-            jgUseRegistrationManageMapper.update(null, updateWrapper);
+            for(JgUseRegistrationManage useRegistrationManage : jgUseRegistrationManageList){
+                useRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
+                useRegistrationManage.setVersion(useRegistrationManage.getVersion() + 1);
+                useRegistrationManage.setChangeReason(BusinessTypeEnum.JG_EQUIPMENT_MOVE.getName());
+            }
+            jgUseRegistrationManageService.updateBatchById(jgUseRegistrationManageList);
         }
         for (String equipId : equipIds) {
             resultMap.put(equipId, map1);
@@ -1038,8 +1034,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         List<String> useRegistrationCodes = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getUseRegistrationCode).collect(Collectors.toList());
         LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.in(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCodes);
-        lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode,
-                JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr, JgUseRegistrationManage::getCertificateNo);
         return jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
     }