fix(jg):使用登记个人筛选

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

@@ -21,10 +21,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.*;
 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;
@@ -348,8 +345,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private List<Map<String, Object>> handleUseRegistration(JSONObject map) {
         try {
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            CompanyBo company = reginParams.getCompany();
             // 提交时进行校验设备是否在流程中使用（并发及同时打开多个相同的页面时才会出现此种情况）
-            checkForRepeatUsedEquip(map, reginParams);
+            checkForRepeatUsedEquip(map, company);
             // 使用登记信息
             JgUseRegistration jgUseRegistration = new JgUseRegistration();
             jgUseRegistration.setRegDate(new Date());
@@ -358,8 +356,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
             String supervisoryCode = otherInfo.getSupervisoryCode();
             jgUseRegistration.setSupervisoryCode(supervisoryCode);
-            jgUseRegistration.setUseUnitName(String.valueOf(map.get("useUnitName")));
-            jgUseRegistration.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
+
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
                 jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
             }
@@ -378,7 +375,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 map.put("safetyManagerName", data[1]);
             }
             // 使用单位提交
-            jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            jgUseRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                    company.getCompanyName().split("_")[1] : company.getCompanyName());
+            jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                    company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
             if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
                 jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
@@ -525,10 +525,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         });
     }
 
-    private void checkForRepeatUsedEquip(JSONObject map, ReginParams reginParams) {
+    private void checkForRepeatUsedEquip(JSONObject map, CompanyBo company) {
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             // 流程中或已完成
-            EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").equipRepeatUsedCheck(map.get("equipId").toString(), reginParams.getCompany().getCompanyCode());
+            EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").equipRepeatUsedCheck(map.get("equipId").toString(), company.getCompanyCode());
         }
     }
 
@@ -579,9 +579,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             useRegistration.setPromoter(reginParams.getUserModel().getUserId());
             useRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
             // 使用单位信息
-            useRegistration.setUseUnitName(company.getCompanyName());
-            useRegistration.setUseUnitCreditCode(company.getCompanyCode());
-            List<LinkedHashMap> tree = commonService.getCreatTree();
+            useRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                    company.getCompanyName().split("_")[1] : company.getCompanyName());
+            useRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                    company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             // 接收单位信息
             Optional.ofNullable(useRegistration.getReceiveOrgCode())
                     .filter(code -> code.contains("_"))