企业注册单位类型多选接口修改

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitInfoDto.java

@@ -39,10 +39,10 @@ public class RegUnitInfoDto  extends BaseDto {
     private String unitCodeTypeName;
 
     @ApiModelProperty(value = "单位类型")
-    private String unitType;
+    private List<String> unitTypeList;
 
     @ApiModelProperty(value = "单位类型code")
-    private String unitTypeCode;
+    private List<String> unitTypeCodeList;
 
     @ApiModelProperty(value = "管辖机构")
     private String managementUnit;

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

@@ -99,6 +99,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             model.setUnitCodeType("1060");
             model.setUnitCodeTypeName("营业执照");
             Bean.copyExistPropertis(model, regUnitInfo);
+            regUnitInfo.setUnitType(StringUtils.join(model.getUnitTypeList(),","));
+            regUnitInfo.setUnitTypeCode(StringUtils.join(model.getUnitTypeCodeList(),","));
             // 1.插入单位注册许可信息表：tz_base_unit_licence
             List<BaseUnitLicenceDto> unitLicenceDtos = model.getUnitLicences();
             List<BaseUnitLicence> baseUnitLicences = unitLicenceDtos.stream().map(s -> {
@@ -161,7 +163,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
         // 2.填充数据
         TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
         baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName());
-        baseEnterpriseInfo.setUnitType(regUnitInfo.getUnitType());
+        baseEnterpriseInfo.setUnitType(StringUtils.join(regUnitInfo.getUnitTypeList(),"#"));
         baseEnterpriseInfo.setUseCode(regUnitInfo.getUnitCode());
         baseEnterpriseInfo.setUseUnit(regUnitInfo.getName());
         baseEnterpriseInfo.setProvince(regUnitInfo.getProvince());
@@ -353,18 +355,21 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             agencyUserModel.setMobile(adminTel);
             String unitTypeCode = regUnitInfo.getUnitTypeCode();
             // 根据unitTypeCode 获取应用和角色 数据字典配置
-            DataDictionary unitType = iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, unitTypeCode));
-            String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
-            String[] appCodes = appCode.split(",");
+            String[] units = unitTypeCode.split(",");
             Set<String> appCodesSet = new HashSet<>();
-            Collections.addAll(appCodesSet, appCodes);
             Map<Long, List<Long>> roleSeqMap = new HashMap<>();
-            roleNameSet.add(unitType.getName());
-            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
-            userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
-            roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
-            orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
+            for(String TypeCode: units) {
+                DataDictionary unitType = iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, TypeCode));
+                String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
+                String[] appCodes = appCode.split(",");
+                Collections.addAll(appCodesSet, appCodes);
+                roleNameSet.add(unitType.getName());
+                userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
+                userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
+                roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
+                orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
+            }
             agencyUserModel.setAppCodes(new ArrayList<>(appCodesSet));
             agencyUserModel.setOrgRoles(orgRoles);
             agencyUserModel.setOrgRoleSeqs(roleSeqMap);