Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -192,14 +192,15 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType), IdxBizJgProjectContraption::getUscUnitCreditCode, companyCode)
                 .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.USE.getName().equals(companyType), IdxBizJgProjectContraption::getUseUnitCreditCode, companyCode)
                 .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.INDIVIDUAL.getName().equals(companyType), IdxBizJgProjectContraption::getUseUnitCreditCode, companyCode.split("_").length > 1 ? companyCode.split("_")[1] : companyCode)
-                // 监管机构按照属地监管部门orgCode进行过滤
+                // 监管机构按照属地监管部门orgCode进行过滤【最大数据集合】
                 .likeRight(ValidationUtil.isEmpty(useRegDetail) && BaseController.COMPANY_TYPE_SUPERVISION.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, company.getOrgCode())
                 .eq(!ValidationUtil.isEmpty(params.get(IS_INTO_MANAGEMENT)), IdxBizJgProjectContraption::getIsIntoManagement, isIntoManagement)
                 .eq(!ValidationUtil.isEmpty(useRegistrationCode), IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
                 .eq(!ValidationUtil.isEmpty(equCategory), IdxBizJgProjectContraption::getEquCategory, equCategory)
                 .eq(!ValidationUtil.isEmpty(equDefine), IdxBizJgProjectContraption::getEquDefine, equDefine)
                 .like(!ValidationUtil.isEmpty(projectContraption), IdxBizJgProjectContraption::getProjectContraption, projectContraption)
-                .eq(!ValidationUtil.isEmpty(orgBranchCode), IdxBizJgProjectContraption::getOrgCode, orgBranchCode)
+                .eq(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode)            // 企业 等于匹配
+                .likeRight(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_SUPERVISION.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode) // 监管 右模糊匹配
                 .like(!ValidationUtil.isEmpty(projectContraptionNo), IdxBizJgProjectContraption::getProjectContraptionNo, projectContraptionNo)
                 .isNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.TRUE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::getUseRegistrationCode)
                 .isNotNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.FALSE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::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/IdxBizJgRegisterInfoServiceImpl.java

@@ -2596,8 +2596,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         // 增加监管端查询, 查询规则看到本级及之下的设备
         if(!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))){
+            if(companyLevel.equals(BaseController.COMPANY_TYPE_SUPERVISION)) { // 监管 右模糊查询
+                boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(company.getString("ORG_BRANCH_CODE")) + "*"));
+            } else {                                                           // 企业 等于查询
                 boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", map.getString("ORG_BRANCH_CODE")));
             }
+        }
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);

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

@@ -959,9 +959,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     equList.forEach(info -> {
                         JSONObject equInfo = JSONObject.parseObject(info.toString());
                         JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
-                        jgCertificateChangeRecordEq.setEquId(equInfo.get("SEQUENCE_NBR").toString());
+                        jgCertificateChangeRecordEq.setEquId(Objects.isNull(equInfo.get("SEQUENCE_NBR"))? null : equInfo.get("SEQUENCE_NBR").toString());
                         jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
-                        jgCertificateChangeRecordEq.setProductCode(equInfo.get("FACTORY_NUM").toString());
+                        jgCertificateChangeRecordEq.setProductCode(Objects.isNull(equInfo.get("FACTORY_NUM"))? null : equInfo.get("FACTORY_NUM").toString());
                         jgCertificateChangeRecordEqs.add(jgCertificateChangeRecordEq);
                     });
                 }

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);
                 //修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
@@ -1309,6 +1310,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 useRegistrationManageService.updateById(registrationManage);
                 //新增使用登记证和设备变更记录
                 this.saveRecordByProjectContraption(registrationManage,registration);
+
+                //通过装置Id查询出设备进行更新 更新其他关联表
+                this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(),registration,Boolean.FALSE,null);
             } else {
                 IdxBizJgProjectContraption idxBizJgProjectContraption =  projectContraptionService.getBaseMapper().selectById(Long.valueOf(sequenceNbr));
                 //查询使用登记表eq 查询和装置关联的管道，取第一个用于生成登记编号
@@ -1322,10 +1326,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 +1346,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 +1355,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());
@@ -1357,9 +1362,57 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 projectContraptionService.updateById(idxBizJgProjectContraption);
                 //新增使用登记证和设备变更记录
                 this.saveRecordByProjectContraption(registrationManage,registration);
+                //通过装置Id查询出设备进行更新 更新其他关联表
+                this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(),registration,Boolean.TRUE,code);
+            }
         }
+
     }
 
+    /**
+     * 更新关系表
+     * @param sequenceNbr
+     * @param registration
+     * @param flag
+     * @param useOrgCode
+     */
+    private void updateRelationTable(Long sequenceNbr, JgChangeRegistrationUnit registration, Boolean flag,String useOrgCode) {
+        LambdaQueryWrapper<JgChangeRegistrationUnitEq> unitEqWrapper = new LambdaQueryWrapper<>();
+        unitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,sequenceNbr)
+                .eq(JgChangeRegistrationUnitEq::getIsDelete,false);
+        List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list();
+        if(!CollectionUtils.isEmpty(changeRegistrationUnitEqs)){
+            for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : changeRegistrationUnitEqs) {
+                String equipId = jgChangeRegistrationUnitEq.getEquId();
+                LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
+                queryWrapper1.eq(OtherInfo::getRecord, equipId);
+                OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
+                if (ObjectUtils.isNotEmpty(tzsJgOtherInfo)) {
+                    LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
+                    queryWrapper2.eq(UseInfo::getRecord, equipId);
+                    UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
+                    if (ObjectUtils.isNotEmpty(useInfo)) {
+                        useInfo.setUseUnitName(registration.getNewUseUnitName());
+                        useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
+                        useInfoMapper.updateById(useInfo);
+                    }
+                    //修改ES中使用单位信息和使用单位代码
+                    Map<String, Map<String, Object>> resultMap = new HashMap<>();
+                    Map<String, Object> map1 = new HashMap<>();
+                    String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
+                    map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
+                    map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
+                    map1.put("REC_DATE", new Date());// 更新时间
+                    if(Boolean.TRUE.equals(flag)){
+                        map1.put("USE_ORG_CODE", useOrgCode);
+                    }
+                    resultMap.put(equipId, map1);
+                    tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+                    //修改各类告知列表，置为废弃
+                    this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
+                }
+            }
+        }
     }
 
     /**