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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CompanyTypeEnum.java

@@ -29,7 +29,7 @@ public enum CompanyTypeEnum {
 
     FILLING("company","filling", "充装单位"),
 
-    INDIVIDUAL("company","individual", "个人"),
+    INDIVIDUAL("company","individual", "个人主体"),
 
     CONSTRUCTION("company","construction", "安装改造维修单位"),
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -130,6 +130,25 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.getUnitListByType(type));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/getMessage")
+    public ResponseModel<Map<String, Object>> getMessage() {
+        ReginParams selectedOrgInfo = getSelectedOrgInfo();
+        HashMap<String, Object> map = new HashMap<>();
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
+            map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
+            String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
+            map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
+        } else {
+            map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
+            map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+        }
+        return ResponseHelper.buildResponse(map);
+    }
+
     /**
      * 查找当前公司下所属的安全管理员
      *

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java

@@ -112,17 +112,6 @@ public class JgChangeRegistrationReformController extends BaseController {
 		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,equipId));
 	}
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "获取使用单位code及name", notes = "获取使用单位code及name")
-	@GetMapping(value = "/getMessage")
-	public ResponseModel<Map<String, Object>> getMessage() {
-		ReginParams selectedOrgInfo = getSelectedOrgInfo();
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
-		map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
-		return ResponseHelper.buildResponse(map);
-	}
-
 	/**
 	 * 改造登记-导出使用登记证
 	 * @param response 返回

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -94,6 +94,7 @@ public class JgUseRegistrationController extends BaseController {
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         ReginParams info = getSelectedOrgInfo();
+        dto.setUnitCode(info.getCompany().getCompanyCode());
         dto.setCurrentUserId(info.getUserModel().getUserId());
         if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
@@ -131,8 +132,16 @@ public class JgUseRegistrationController extends BaseController {
     public ResponseModel<Map<String, Object>> getMessage() {
         ReginParams selectedOrgInfo = getSelectedOrgInfo();
         HashMap<String, Object> map = new HashMap<>();
-        map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
-        map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
+            map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
+            String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
+            map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
+        } else {
+            map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
+            map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+        }
         return ResponseHelper.buildResponse(map);
     }
 

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

@@ -773,12 +773,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * 根据record判断设备完成了哪些业务（安装告知/维保备案/使用登记）
      * @return
      */
-    public List<String> judgeTheBusinessAccordingByRecord(String record,Map<String, Object> objMap){
-        List<String> businessList = new ArrayList<>();
+    public String judgeTheBusinessAccordingByRecord(String record,Map<String, Object> objMap){
+        String business = "";
         // 安装告知
         Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetail(record);
         if (!ObjectUtils.isEmpty(installDetail)){
-            businessList.add("安装告知");
+            business = business + ",安装告知";
             objMap.putAll(installDetail);
             objMap.put("insOtherAccessories",JSON.parse(Optional.ofNullable(installDetail.get("insOtherAccessories")).orElse("").toString()));
             objMap.put("installProxyStatementAttachment",JSON.parse(Optional.ofNullable(installDetail.get("installProxyStatementAttachment")).orElse("").toString()));
@@ -787,7 +787,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 维保备案
         Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
         if (!ObjectUtils.isEmpty(maintenanceDetail)){
-            businessList.add("维保备案");
+            business = business + ",维保备案";
             objMap.putAll(maintenanceDetail);
             objMap.put("maintenanceContract",JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintenanceContract")).orElse("").toString()));
             objMap.put("maintOtherAccessories",JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintOtherAccessories")).orElse("").toString()));
@@ -795,10 +795,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 使用登记
         Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);
         if (!ObjectUtils.isEmpty(useRegistrationDetail)){
-            businessList.add("使用登记");
+            business = business + ",使用登记";
             objMap.putAll(useRegistrationDetail);
         }
-        return businessList;
+        return business;
     }
 
     /**
@@ -1093,7 +1093,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             result.setTotal(0);
             return result;
         }
-        String companyCode = company.getString("companyCode");
+        String companyCode = company.getString("companyCode").contains("_") ?
+                company.getString("companyCode").split("_")[1] : company.getString("companyCode");
         String type = company.getString("companyType");
 
 
@@ -1190,7 +1191,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
             BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
             String useCode = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
-            // useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
+            useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
             ubuilder.should(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", useCode));
 
             String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE")).toLowerCase();
@@ -1202,7 +1203,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
                 String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
                 String param = QueryParser.escape(uucc);
-                // param = param.contains("_") ? param.split("_")[0] : param;
+                param = param.contains("_") ? param.split("_")[0] : param;
                 uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
                 boolMust.must(uuccBuilder);
             }

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

@@ -13,10 +13,10 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
@@ -545,10 +545,10 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         String companyType = getStringFromMap(companyTypeMap, "companyType");
 
         if ("company".equals(companyLevel) && companyType != null) {
-            if (companyType.contains("use")) {
+            if (companyType.contains(CompanyTypeEnum.USE.getCode()) || companyType.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
                 dto.setUseUnitCodeFilter(company.getCompanyCode());
             }
-            if (companyType.contains("construction")) {
+            if (companyType.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
                 dto.setInstallUnitCodeFilter(company.getCompanyCode());
             }
         }

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

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
@@ -111,12 +112,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             // 监管单位用"接收机构统一使用代码"匹配
             dto.setReceiveOrgCodeFilter(company.getCompanyCode());
         } else if ("company".equals(companyLevel)) {
-            if (companyType.contains("use")) {
+            if (companyType.contains(CompanyTypeEnum.USE.getCode()) || companyType.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
                 // 使用单位用"使用单位统一信用代码"匹配数据
                 dto.setUseUnitCodeFilter(company.getCompanyCode());
                 dto.setRoleIds(null);
             }
-            if (companyType.contains("construction")) {
+            if (companyType.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
                 // 维保单位用"维保单位统一信用代码"匹配数据
                 dto.setMaintenanceUnitCodeFilter(company.getCompanyCode());
             }

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

@@ -621,6 +621,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
 
             // 更新tz_base_enterprise_info信息
             baseEnterpriseInfo.setAddress(individualityDto.getAddress());
+            baseEnterpriseInfo.setContactPhone(individualityDto.getPhone());
+            baseEnterpriseInfo.setUseContact(individualityDto.getName());
             baseEnterpriseInfoService.updateById(baseEnterpriseInfo);
             // 更新privilege_agency_user手机号
             ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);