1.修改公共模块人员管理编辑时删除的资质未删除掉bug

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
@@ -38,7 +39,7 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 
 	String syncEnterpriseInfo();
 
-	TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map);
+	TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map, ReginParams selectedOrgInfo);
 
 	Map<String,Object> adminInfoUpdate(Map<String, Object> map);
 

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tcm.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
@@ -45,7 +46,7 @@ import java.util.*;
 @RestController
 @Api(tags = "企业数据信息Api")
 @RequestMapping(value = "/baseEnterprise", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-public class TzBaseEnterpriseInfoController {
+public class TzBaseEnterpriseInfoController extends BaseController {
 
     @Autowired
     ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
@@ -211,7 +212,7 @@ public class TzBaseEnterpriseInfoController {
     @RequestMapping(value = "/companyInfoUpdate", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "修改企业信息", notes = "修改企业信息")
     public ResponseModel<TzBaseEnterpriseInfoDto> companyInfoUpdate(@RequestBody Map<String, Object> map) {
-        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.companyInfoUpdate(map));
+        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.companyInfoUpdate(map, getSelectedOrgInfo()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -8,7 +8,6 @@ import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -52,7 +51,6 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.sql.Array;
 import java.text.ParseException;
 import java.util.*;
 import java.util.function.Predicate;
@@ -108,14 +106,29 @@ public class TzBaseEnterpriseInfoServiceImpl
     @Autowired
     private EquipmentCategoryServiceImpl equipmentCategoryService;
 
-    private static final Map<String ,String> JYJC_CERT_MAP = new HashMap<>();
+    private static Map<String ,String> JYJC_CERT_MAP = new HashMap<>();
+
+	/**
+	 * 公司类型下的资质类型map:key为登录人的公司类型、value为包含的资质枚举
+	 */
+	private static Map<String ,String> COMPANY_TYPE_CERT_TYPE_MAP = new HashMap<>();
+    // 数据来源cb_data_dictionary type='UNIT_TYPE_NEW'
+	static {
+		COMPANY_TYPE_CERT_TYPE_MAP.put("使用单位", "1232");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("充装单位", "1231");
+		// 注意检验检测机构资质细分为1233-1、1233-2
+		COMPANY_TYPE_CERT_TYPE_MAP.put("检验检测机构", "1233");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("制造单位", "1236");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("设计单位", "1235");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("安装改造维修单位", "1234");
+	}
 
 	/**
 	 * 机构类别字典类型
 	 */
 	private static final String JYJC_TYPE_DICT_CODE = "JYJC_TYPE";
 
-    static {
+	static {
 		JYJC_CERT_MAP.put("1233-1","检验机构");
 		JYJC_CERT_MAP.put("1233-2","检测机构");
 	}
@@ -509,7 +522,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Transactional
 	@Override
-	public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
+	public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map, ReginParams reginParams) {
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
 		tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
 		tzBaseEnterpriseInfo = tzBaseEnterpriseInfoService.getById(tzBaseEnterpriseInfo.getSequenceNbr());
@@ -592,21 +605,10 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 			regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
 		}
-
-		//修改许可信息
-		List<BaseUnitLicence> licences = Lists.newArrayList();
-		List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList();
-		JSON.parseArray(JSON.toJSONString(map.get("unitLicences"))).forEach(obj -> {
-			BaseUnitLicence baseUnitLicence = JSON.toJavaObject((JSONObject )obj, BaseUnitLicence.class);
-			baseUnitLicence.setUnitCode(ObjectUtils.isEmpty(map.get("useCode")) ? null : (String)map.get("useCode"));
-			baseUnitLicence.setUnitName(ObjectUtils.isEmpty(map.get("useUnit")) ? null : (String)map.get("useUnit"));
-			// 处理许可字典值对应名称
-			handleDictName(baseUnitLicence, dictionaries);
-			licences.add(baseUnitLicence);
-		});
-		if (!ValidationUtil.isEmpty(licences)){
-			baseUnitLicenceService.saveOrUpdateBatch(licences);
-		}
+		//许可信息先登录人选择的身份删除相应的许可信息,原因前端列表对数据可增减
+		removeLicenceDataBeforeSave(reginParams, tzBaseEnterpriseInfo);
+		//报错许可许可信息
+		saveLicenceData(map);
 		// 企业信息变更-同步修改企业下人员绑定设备类型
 		ArrayList<String> newData = new ArrayList<>();
 		JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());
@@ -635,6 +637,29 @@ public class TzBaseEnterpriseInfoServiceImpl
 
     }
 
+	private void saveLicenceData(Map<String, Object> map) {
+		List<BaseUnitLicence> licences = Lists.newArrayList();
+		List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList();
+		JSON.parseArray(JSON.toJSONString(map.get("unitLicences"))).forEach(obj -> {
+			BaseUnitLicence baseUnitLicence = JSON.toJavaObject((JSONObject)obj, BaseUnitLicence.class);
+			baseUnitLicence.setUnitCode(ObjectUtils.isEmpty(map.get("useCode")) ? null : (String)map.get("useCode"));
+			baseUnitLicence.setUnitName(ObjectUtils.isEmpty(map.get("useUnit")) ? null : (String)map.get("useUnit"));
+			// 处理许可字典值对应名称
+			handleDictName(baseUnitLicence, dictionaries);
+			licences.add(baseUnitLicence);
+		});
+		if (!ValidationUtil.isEmpty(licences)){
+			baseUnitLicenceService.saveOrUpdateBatch(licences);
+		}
+	}
+
+	private void removeLicenceDataBeforeSave(ReginParams reginParams, TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {
+		String companyType = reginParams.getCompany().getCompanyType();
+		baseUnitLicenceService.remove(new LambdaQueryWrapper<BaseUnitLicence>()
+				.likeRight(BaseUnitLicence::getCertTypeCode, COMPANY_TYPE_CERT_TYPE_MAP.get(companyType))
+				.eq(BaseUnitLicence::getUnitCode,tzBaseEnterpriseInfo.getUseCode()));
+	}
+
 	/**
 	 * 处理单位许可证书名称。
 	 * 该方法通过查询数据字典，根据给定的许可证书代码，设置许可证书的类型、项目代码名称、子项目名称、参数名称、