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

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

@@ -769,6 +769,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
 
         objMap.put("completedBusinessTypes",judgeTheBusinessAccordingByRecord(record,objMap));
+        // 账号类型（用于车用气瓶流程页面-》监管审核-》打开设备详情 时隐藏保存按钮）
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        objMap.put("accountType",reginParams.getCompany().getCompanyType());
         return objMap;
     }
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java

@@ -312,6 +312,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	// 事业单位信息
 	private TzsBaseInstitution regUnitMessage;
 
-	// 工商和许可信息是否可编辑
+	// 工商信息是否可编辑
 	private String canEdit;
+
+	// 许可信息是否可编辑
+	private String licenseCanEdit;
 }

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

@@ -250,6 +250,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			regUnitIcDto.setIsNotAccess("1");
 			// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
 			tzBaseEnterpriseInfoDto.setCanEdit("0");
+			tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
 		} else {
 			regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
 			regUnitIcDto.setIsNotAccess("0");
@@ -260,6 +261,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			regUnitIcDto.setRegisterAddressList(addressList);
 			// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
 			tzBaseEnterpriseInfoDto.setCanEdit("1");
+			tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
 		}
 		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
 		tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());

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

@@ -187,6 +187,11 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			// 2.异步调用ugp，同步公司数据
 			FutureTask<ResponseModel<Boolean>> future = getResponseModelFutureTask(model);
 			// 3.插入单位注册许可信息表：tz_base_unit_licence
+			// 3.1先删除已有许可信息 （2024-04-02放开企业许可信息编辑功能）
+			LambdaQueryWrapper<BaseUnitLicence> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(BaseUnitLicence::getUnitCode, model.getUnitCode());
+			baseUnitLicenceService.remove(queryWrapper);
+			// 3.2再插入新许可信息
 			List<BaseUnitLicence> baseUnitLicences = model.getUnitLicences().stream().map(s -> {
 				s.setUnitCode(model.getUnitCode());
 				s.setUnitName(model.getName());