Merge branch 'develop_tzs_register' of…

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

@@ -1290,6 +1290,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 LambdaQueryWrapper<JgUseRegistrationManage> useRegistrationManageWrapper = new LambdaQueryWrapper<>();
                 useRegistrationManageWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode,useRegistrationCode)
                         .isNotNull(JgUseRegistrationManage::getUseRegistrationCode)
+                        .eq(JgUseRegistrationManage::getCertificateStatus,"已登记")
                         .eq(BaseEntity::getIsDelete,false);
                 JgUseRegistrationManage registrationManage = useRegistrationManageService.getBaseMapper().selectOne(useRegistrationManageWrapper);
                 //修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
@@ -1322,10 +1323,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 LambdaQueryWrapper<JgUseRegistrationManage> useRegistrationManageWrapper = new LambdaQueryWrapper<>();
                 useRegistrationManageWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode,useRegistrationCode)
                         .isNotNull(JgUseRegistrationManage::getUseRegistrationCode)
+                        .eq(JgUseRegistrationManage::getCertificateStatus,"已登记")
                         .eq(BaseEntity::getIsDelete,false);
-                JgUseRegistrationManage registrationManage = useRegistrationManageService.getBaseMapper().selectOne(useRegistrationManageWrapper);
-                long nextId = sequence.nextId();
-                registrationManage.setSequenceNbr(nextId);
+                List<JgUseRegistrationManage> registrationManages = useRegistrationManageService.getBaseMapper().selectList(useRegistrationManageWrapper);
+                if(CollUtil.isEmpty(registrationManages)){
+                    throw new BadRequest("使用登记编号为："+useRegistrationCode+"不存在");
+                }
+                if(registrationManages.size()!=1){
+                    throw new BadRequest("使用登记编号为："+useRegistrationCode+"有重复数据,请排查");
+                }
+                JgUseRegistrationManage registrationManage=registrationManages.get(0);
+                registrationManage.setSequenceNbr(sequence.nextId());
                 String code = commonServiceImpl.generateRegistrationCode(changeRegistrationUnitEqs.get(0).getEquId(), idxBizJgProjectContraption.getSupervisoryCode(),
                         registrationManage.getReceiveCompanyCode(), true);
                 registrationManage.setUseRegistrationCode(code);
@@ -1335,7 +1343,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
                 registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
                 registrationManage.setAuditPassDate(registration.getAuditPassDate());
-                registrationManage.setVersion(registrationManage.getVersion() + 1);
+                registrationManage.setVersion(1);
                 registrationManage.setChangeReason(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
                 if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {//回填新单位地址
                     TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
@@ -1344,12 +1352,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     }
                 }
                 useRegistrationManageService.save(registrationManage);
-                //更新使用登记关系表
-                LambdaUpdateWrapper<JgChangeRegistrationUnitEq> registrationUnitEqUpdateWrapper = new LambdaUpdateWrapper<>();
-                registrationUnitEqUpdateWrapper.set(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,nextId)
-                        .set(JgChangeRegistrationUnitEq::getRegistrationCertificate,code)
-                        .eq(JgChangeRegistrationUnitEq::getProjectContraptionId,idxBizJgProjectContraption.getSequenceNbr());
-                registrationUnitEqService.update(registrationUnitEqUpdateWrapper);
                 //更新装置表
                 idxBizJgProjectContraption.setUseRegistrationCode(code);
                 idxBizJgProjectContraption.setUseUnitName(registration.getNewUseUnitName());