Commit e64007f5 authored by tianbo's avatar tianbo

检验检测单位许可调整为可编辑

parent 4c68d44a
...@@ -312,6 +312,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto { ...@@ -312,6 +312,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
// 事业单位信息 // 事业单位信息
private TzsBaseInstitution regUnitMessage; private TzsBaseInstitution regUnitMessage;
// 工商和许可信息是否可编辑 // 工商信息是否可编辑
private String canEdit; private String canEdit;
// 许可信息是否可编辑
private String licenseCanEdit;
} }
...@@ -250,6 +250,7 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -250,6 +250,7 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitIcDto.setIsNotAccess("1"); regUnitIcDto.setIsNotAccess("1");
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑 // 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
tzBaseEnterpriseInfoDto.setCanEdit("0"); tzBaseEnterpriseInfoDto.setCanEdit("0");
tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
} else { } else {
regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto(); regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
regUnitIcDto.setIsNotAccess("0"); regUnitIcDto.setIsNotAccess("0");
...@@ -260,6 +261,7 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -260,6 +261,7 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitIcDto.setRegisterAddressList(addressList); regUnitIcDto.setRegisterAddressList(addressList);
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑 // 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
tzBaseEnterpriseInfoDto.setCanEdit("1"); tzBaseEnterpriseInfoDto.setCanEdit("1");
tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
} }
tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto); tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate()); tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
......
...@@ -187,6 +187,11 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -187,6 +187,11 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
// 2.异步调用ugp,同步公司数据 // 2.异步调用ugp,同步公司数据
FutureTask<ResponseModel<Boolean>> future = getResponseModelFutureTask(model); FutureTask<ResponseModel<Boolean>> future = getResponseModelFutureTask(model);
// 3.插入单位注册许可信息表:tz_base_unit_licence // 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 -> { List<BaseUnitLicence> baseUnitLicences = model.getUnitLicences().stream().map(s -> {
s.setUnitCode(model.getUnitCode()); s.setUnitCode(model.getUnitCode());
s.setUnitName(model.getName()); s.setUnitName(model.getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment