fix(jg):单位变更bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -81,7 +81,7 @@
         <include refid="page_list"/>,
         (SELECT ei.sequence_nbr from idx_biz_jg_use_info ui
         LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ui.record
-        LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = ui.ESTATE_UNIT_CREDIT_CODE
+        LEFT JOIN tz_base_enterprise_info ei ON ei.use_unit_code = ui.ESTATE_UNIT_CREDIT_CODE
         WHERE ri.USE_ORG_CODE = tjurm.use_registration_code ORDER BY ui.REC_DATE DESC limit 1) AS estateUnitName
         FROM tzs_jg_use_registration_manage tjurm
         <where>
@@ -420,7 +420,7 @@
         SELECT distinct
         ibjpc.*,
         (SELECT ei.sequence_nbr from idx_biz_jg_use_info ui
-        LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = ui.ESTATE_UNIT_CREDIT_CODE
+        LEFT JOIN tz_base_enterprise_info ei ON ei.use_unit_code = ui.ESTATE_UNIT_CREDIT_CODE
         WHERE ui.PROJECT_CONTRAPTION_ID = ibjpc.sequence_nbr ORDER BY ui.REC_DATE DESC LIMIT 1) AS estateUnitName
         FROM
         idx_biz_jg_project_contraption ibjpc

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

@@ -1140,17 +1140,19 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             registration.setProcessAdvice(dto.getProcessAdvice());
             List<String> roleListAll = new ArrayList<>();
             ArrayList<String> roleList = new ArrayList<>();
-            dto.getRegistrationList().forEach(v -> {
-                String newCarNumber = String.valueOf(v.get("newCarNumber"));
-                String useOrgCode = String.valueOf(v.get("useRegistrationCode"));
-                if (!ObjectUtils.isEmpty(newCarNumber) && "0".equals(op)) {
-                    // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
-                    Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniqueness(newCarNumber, useOrgCode);
-                    if (count > 0) {
-                        throw new BadRequest("车牌号已存在，请重新输入！");
+            if (!CollectionUtils.isEmpty(dto.getRegistrationList())) {
+                dto.getRegistrationList().forEach(v -> {
+                    String newCarNumber = String.valueOf(v.get("newCarNumber"));
+                    String useOrgCode = String.valueOf(v.get("useRegistrationCode"));
+                    if (!ObjectUtils.isEmpty(newCarNumber) && "0".equals(op)) {
+                        // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
+                        Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniqueness(newCarNumber, useOrgCode);
+                        if (count > 0) {
+                            throw new BadRequest("车牌号已存在，请重新输入！");
+                        }
                     }
-                }
-            });
+                });
+            }
 
             //组装信息
             TaskResultDTO task = new TaskResultDTO();
@@ -1235,7 +1237,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             if (!records.isEmpty() && enterpriseInfo !=null) {
                                 idxBizJgUseInfoService.update(
                                         new IdxBizJgUseInfo()
-                                                .setEstateUnitCreditCode(enterpriseInfo.getUseCode())
+                                                .setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
                                                 .setEstateUnitName(enterpriseInfo.getUseUnit()),
                                         new LambdaQueryWrapper<IdxBizJgUseInfo>()
                                                 .in(IdxBizJgUseInfo::getRecord, records)
@@ -1297,8 +1299,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     registration.setNextTaskId(nextTaskId);
                     registration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
                     executeOneStep(registration, taskName1, nextUserIds, op);
-                    history.setChangeData(JSONObject.toJSONString(dto.getRegistrationList()));
-                    registrationHistoryService.updateById(history);
+                    if ("5000".equals(dto.getEquListCode())){
+                        history.setChangeData(JSONObject.toJSONString(dto.getRegistrationList()));
+                        registrationHistoryService.updateById(history);
+                    }
                 }
             } else {
                 registration.setPromoter("");
@@ -1354,7 +1358,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             //更新产权信息
             if (enterpriseInfo != null){
                 idxBizJgUseInfoService.update(
-                        new IdxBizJgUseInfo().setEstateUnitCreditCode(enterpriseInfo.getUseCode())
+                        new IdxBizJgUseInfo().setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
                                 .setEstateUnitName(enterpriseInfo.getUseUnit()),
                         new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, sequenceNbr)
                 );