Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/UnitTypeNewEnum.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UnitTypeNewEnum.java

-package com.yeejoin.amos.boot.module.statistics.api.enums;
+package com.yeejoin.amos.boot.module.common.api.enums;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -70,4 +70,19 @@ public enum UnitTypeNewEnum {
         }
         return jsonArray;
     }
+
+    public static JSONArray getUnitTypeByLabel(String label) {
+        JSONArray jsonArray = new JSONArray();
+        for (UnitTypeNewEnum e : UnitTypeNewEnum.values()) {
+            if (e.label.equals(label)) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("label", e.label);
+                jsonObject.put("value", e.value);
+                jsonObject.put("key", e.code);
+                jsonArray.add(jsonObject);
+                return jsonArray;
+            }
+        }
+        return jsonArray;
+    }
 }
\ No newline at end of file

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

@@ -33,7 +33,9 @@ public enum CompanyTypeEnum {
 
     CONSTRUCTION("company","construction", "安装改造维修单位"),
 
-    INSPECTION("company","inspection", "检验检测机构");
+    INSPECTION("company","inspection", "检验机构"),
+
+    INSPECTION_CE("company","inspection", "检测机构");
 
     private final String level;
     private final String code;

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

@@ -969,7 +969,7 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public List<Map<String, Object>> getAllInspectionInfo(String type) {
         List<Map<String, Object>> unitList = new ArrayList<>();
-        if ("检验检测机构".equals(type)) {
+        if ("检验机构".equals(type)|| "检测机构".equals(type)) {
             Systemctl.dictionarieClient.dictValues("OLD_INSPECTION_TESTING_UNIT").getResult()
                     .forEach(x -> convertAndAddToUnitList(x, unitList));
         }

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

@@ -4763,13 +4763,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void checkInspectOrg(String inspectOrgCode, StringBuilder result) {
-        List<Map<String, Object>> InspectOrgList = commonService.getAllInspectionInfo("检验检测机构");
-        if (findUseCode(InspectOrgList, inspectOrgCode) == null) {
-            result.append("未查询到该检验机构；");
-        }
-    }
-
     // 检查字段是否为空，如果为空则追加错误信息到result
     private void checkNotBlank(String value, String errorMessage, StringBuilder result) {
         if (org.apache.commons.lang3.StringUtils.isBlank(value)) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RequestContextWrapper;
 import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
 import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
+import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeNewEnum;
 import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.MinioUtils;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/service/IRegUnitInfoService.java

 package com.yeejoin.amos.boot.module.tcm.flc.api.service;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -101,4 +102,6 @@ public interface IRegUnitInfoService {
      * @return RegUnitInfoDto
      */
     RegUnitInfoDto regBeforeCheckForPerson(String unitCode, String cardType);
+
+    JSONArray queryUnitType(String type);
 }

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

@@ -147,13 +147,13 @@ public class TzBaseEnterpriseInfoServiceImpl
 		COMPANY_TYPE_CERT_TYPE_MAP.put("检验机构", "1233-1,1233-2");
 		COMPANY_TYPE_CERT_TYPE_MAP.put("检测机构", "1233-2");
 		// 安装改造维修单位身份资质：充装单位-1231 制造单位-1236 设计单位-1235 安装改造维修单位-1234
-		COMPANY_TYPE_CERT_TYPE_MAP.put("安装改造维修单位", "1231,1234,1235,1236");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("安装改造维修单位", "1234");
 		// 充装单位
-		COMPANY_TYPE_CERT_TYPE_MAP.put("充装单位", "1231,1234,1235,1236");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("充装单位", "1231");
 		// 制造单位
-		COMPANY_TYPE_CERT_TYPE_MAP.put("制造单位", "1231,1234,1235,1236");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("制造单位", "1236");
 		// 设计单位
-		COMPANY_TYPE_CERT_TYPE_MAP.put("设计单位", "1231,1234,1235,1236");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("设计单位", "1235");
 	}
 
 	/**
@@ -222,8 +222,10 @@ public class TzBaseEnterpriseInfoServiceImpl
 		tzBaseEnterpriseInfoDto.setUnitType(companyType);
 
 		// 当前用户选择角色的许可信息（使用。。安改维。。检验检测。。）
+        assert tzBaseEnterpriseInfo != null;
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
-				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode())
+				.eq(BaseUnitLicence::getIsDelete, false));
 		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<>();
 		List<BaseUnitLicence> unitLicencesCollect = Optional.ofNullable(unitLicences).orElse(Collections.emptyList());
 		if (!"监管机构".equals(companyType)) {
@@ -232,10 +234,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 					.split(","));
 			// 充装、检验检测、制造、设计、安改维
 			unitLicencesCollect = unitLicencesCollect.stream()
-					.filter(unit -> unit.getCertTypeCode() != null && (certTypeList.contains(unit.getCertTypeCode())
-							|| "1235".equals(unit.getCertTypeCode())
-							|| "1236".equals(unit.getCertTypeCode()))
-					)
+					.filter(unit -> unit.getCertTypeCode() != null && (certTypeList.contains(unit.getCertTypeCode())))
 					.collect(Collectors.toList());
 		}
 		if (!ValidationUtil.isEmpty(unitLicencesCollect)) {
@@ -268,10 +267,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 		}
 		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
 		return tzBaseEnterpriseInfoDto;
-
 	}
 
-
 	@Override
 	public Map<String, Object> getInfoByUseCodeMap(String useCode) {
 		TzBaseEnterpriseInfoDto infoByUseCode = getInfoByUseCode(useCode);

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.tcm.api.dto.AccountDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.BaseInstitutionRegisterDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
@@ -135,7 +136,11 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
             }
             if(!ValidationUtil.isEmpty(dto.getUnitLicences())){
                 //添加不在字典中的登记机关
-                regUnitInfoService.addNotInDJJGDictionary(dto.getUnitLicences());
+                List<String> approvedOrganList = dto.getUnitLicences().stream()
+                        .map(BaseUnitLicenceDto::getApprovedOrgan)
+                        .distinct()
+                        .collect(Collectors.toList());
+                regUnitInfoService.addNotInDJJGDictionary(approvedOrganList);
             }
             regUnitInfoService.save(regUnitInfo);
             // 3.插入单位注册许可信息表：tz_base_unit_licence

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/RegUnitInfoController.java

 package com.yeejoin.amos.boot.module.tcm.flc.biz.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -328,4 +329,16 @@ public class RegUnitInfoController extends BaseController {
     public ResponseModel<List<DataDictionary>> getChildList(@RequestParam(value = "type") String type) {
         return ResponseHelper.buildResponse(iRegUnitInfoService.getXkItemList(type));
     }
+
+    /**
+     * 查询单位类型
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/queryUnitType")
+    @ApiOperation(httpMethod = "GET", value = "查询单位类型", notes = "查询单位类型")
+    public ResponseModel<JSONArray> queryUnitType(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(iRegUnitInfoService.queryUnitType(type));
+    }
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeNewEnum;
 import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
@@ -195,8 +197,19 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             // 2.异步调用ugp，同步公司数据
             FutureTask<ResponseModel<Boolean>> future = getResponseModelFutureTask(model);
             //添加不在字典中的登记机关
-            if (!ValidationUtil.isEmpty(model.getUnitLicences())){
-                this.addNotInDJJGDictionary(model.getUnitLicences());
+            List<String> approvedOrganList = Stream.concat(
+                    model.getUnitLicences() == null ? Stream.empty() :
+                            model.getUnitLicences().stream()
+                                    .map(BaseUnitLicenceDto::getApprovedOrgan)
+                                    .filter(org -> !ValidationUtil.isEmpty(org)),
+                    Optional.ofNullable(model.getRegUnitIc())
+                            .map(RegUnitIcDto::getRegisteredOrgan)
+                            .filter(org -> !ValidationUtil.isEmpty(org))
+                            .map(Stream::of)
+                            .orElseGet(Stream::empty)
+            ).distinct().collect(Collectors.toList());
+            if (!approvedOrganList.isEmpty()) {
+                this.addNotInDJJGDictionary(approvedOrganList);
             }
             // 3.插入单位注册许可信息表：tz_base_unit_licence
             // 3.1先删除已有许可信息 （2024-04-02放开企业许可信息编辑功能）
@@ -296,13 +309,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 
     /**
      * 添加不在字典中的登记机关
-     * @param baseUnitLicences baseUnitLicences
+     * @param approvedOrganList approvedOrganList
      */
-    public void addNotInDJJGDictionary(List<BaseUnitLicenceDto> baseUnitLicences) {
-        List<String> approvedOrganList = baseUnitLicences.stream()
-                .map(BaseUnitLicenceDto::getApprovedOrgan)
-                .distinct()
-                .collect(Collectors.toList());
+    public void addNotInDJJGDictionary(List<String> approvedOrganList) {
         List<DataDictionary> allDictionaryList = this.initAllDataDictionaryList();
         Set<String> existingNames = allDictionaryList.stream()
                 .filter(d -> d.getType().equals(DICT_TYPE_DJJG))
@@ -1166,4 +1175,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
         }
         return regUnitInfoDto;
     }
+
+    public JSONArray queryUnitType(String type) {
+        return UnitTypeNewEnum.getUnitTypeByLabel(type);
+    }
 }
\ No newline at end of file