个人主体查询设备修改

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

@@ -156,6 +156,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     public final static String USE_TYPE_NAME =  "使用单位";
 
+    public final static String INDIVIDUAL_TYPE_NAME =  "个人主体";
+
     public final static String MAINTENANCE_TYPE_NAME =  "安装改造维修单位";
 
     @Value("${add.equip.dict.code.suffix:CATEGORY_LIST_ADD}")
@@ -388,7 +390,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     private String getDictCodePrefix(String companyType) {
         String dictCodePrefix = "";
-        if (companyType.contains(USE_TYPE_NAME) && !companyType.contains(MAINTENANCE_TYPE_NAME)) { // 使用单位
+        if ((companyType.contains(USE_TYPE_NAME) || companyType.contains(INDIVIDUAL_TYPE_NAME)) && !companyType.contains(MAINTENANCE_TYPE_NAME)) { // 使用单位
             dictCodePrefix = "USE";
         }
         if (companyType.contains(MAINTENANCE_TYPE_NAME) && !companyType.contains(USE_TYPE_NAME)) { // 安改维单位

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

@@ -17,6 +17,7 @@ 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.dto.TzsBaseInstitutionDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.*;
+import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
 import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
@@ -26,6 +27,7 @@ import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitInfoDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitInfo;
+import com.yeejoin.amos.boot.module.tcm.flc.api.enums.UnitDataSourceEnum;
 import com.yeejoin.amos.boot.module.tcm.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.tcm.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitIcServiceImpl;
@@ -196,8 +198,10 @@ public class TzBaseEnterpriseInfoServiceImpl
 				creditCode = creditCode.split("_")[1];
 			}
 		}
-		Map<String, Object> resultMap = accessFeignService.getData(creditCode).getResult();
-		if (!ValidationUtil.isEmpty(resultMap)) {
+		// 陕西省内企业从工商平台查询工商信息
+		if (UnitDataSourceEnum.SHAANXI.getName().equals(tzBaseEnterpriseInfo.getDataSources())
+				&& EnterpriseEnums.QY_DW.getTypeName().equals(tzBaseEnterpriseInfo.getRegisterType())) {
+			Map<String, Object> resultMap = accessFeignService.getData(creditCode).getResult();
 			String area = String.valueOf(resultMap.get("area"));
 			String city = area.substring(0, area.indexOf("市") + 1);
 			String district = area.substring(city.length());
@@ -244,6 +248,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 			objects.add(district);
 			regUnitIcDto.setRegisterAddressList(objects);
 			regUnitIcDto.setIsNotAccess("1");
+			// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
+			tzBaseEnterpriseInfoDto.setCanEdit("0");
 		} else {
 			regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
 			regUnitIcDto.setIsNotAccess("0");
@@ -507,8 +513,10 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 		//修改工商信息
 		RegUnitIc regUnitIc = new RegUnitIc();
-		List<String> addressList = (List<String>) map.get("registerAddressList");
-		if (!ValidationUtil.isEmpty(addressList)) {
+		RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
+		});
+		if (!ValidationUtil.isEmpty(regUnitIcDto.getSequenceNbr())) {
+			List<String> addressList = (List<String>) map.get("registerAddressList");
 			tzBaseEnterpriseInfo.setProvince(addressList.get(0));
 			tzBaseEnterpriseInfo.setCity(addressList.get(1));
 			tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
@@ -530,8 +538,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			DataDictionary businessStateDict = iDataDictionaryService.getByCode(String.valueOf(map.get("businessState")),"jyzt");
 			regUnitIc.setBusinessState(ObjectUtils.isEmpty(businessStateDict) ? null : businessStateDict.getName());
 			regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
-			RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
-			});
+
 			regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
 		}