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

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/converter/QualificationProjectConverter.java

@@ -28,6 +28,7 @@ public class QualificationProjectConverter implements Converter<String> {
         CODE_MAP.put("检验员-电梯检验","DTY");
         CODE_MAP.put("检验员-起重机械检验","QZY");
         CODE_MAP.put("检验员-客运索道检验","SDY");
+
         CODE_MAP.put("检验师-大型游乐设施检验","YLS");
         CODE_MAP.put("检验师-锅炉水（介）质检验","SZS");
         CODE_MAP.put("检验师-压力容器检验","RQS");
@@ -37,6 +38,7 @@ public class QualificationProjectConverter implements Converter<String> {
         CODE_MAP.put("检验师-客运索道检验","SDS");
         CODE_MAP.put("检验师-锅炉检验","GLS");
         CODE_MAP.put("检验师-场（厂）内专用机动车辆检验","CCS");
+
         CODE_MAP.put("机电类设备检验","JDG");
         CODE_MAP.put("承压类设备检验","CYG");
     }

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

@@ -98,7 +98,7 @@ public class CompanyUserImportDto {
         private String permissionLevel;
 
         @NotBlank(message = "检验资质项目不能为空！")
-        @ExcelProperty(value = "项目", converter = QualificationProjectConverter.class)
+        @ExcelProperty(value = "项目")
         private String permissionItem;
 
         @NotBlank(message = "检验资质发证日期不能为空！")

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/TzsUserInfoServiceImpl.java

@@ -1428,7 +1428,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                 String sheetName = readSheet.getSheetName();
                 int sheetNo = readSheet.getSheetNo();
                 // 忽略 sheet页：企业人员录入限制（参考）
-                if (sheetName.contains("企业人员录入限制")) {
+                if (sheetName.contains("企业人员录入限制") || sheetName.contains("隐藏")) {
                     continue;
                 }
                 // 人员信息 sheet页
@@ -1641,6 +1641,16 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             dataList.forEach(data -> {
                 if (!ValidationUtil.isEmpty(data.getCertificateNum()) && data.getCertificateNum().equals(inspectItem.getCertificateNum())) {
                     JSONArray permissionData66151 = data.getPermissionData66151();
+                    // , converter = QualificationProjectConverter.class
+                    String permissionLevel = inspectItem.getPermissionLevel();
+                    if (!ValidationUtil.isEmpty(permissionLevel)) {
+                        String permissionItem = inspectItem.getPermissionItem();
+                        Systemctl.dictionarieClient.dictValues("ZZXM_" + permissionLevel).getResult()
+                                .stream()
+                                .filter(x -> permissionItem.equals(StringUtils.isEmpty(x.getDictDataDesc()) ? x.getDictDataValue() : x.getDictDataValue() + "-" + x.getDictDataDesc()))
+                                .findFirst()
+                                .ifPresent(x -> inspectItem.setPermissionItem(x.getDictDataKey()));
+                    }
                     permissionData66151.add(inspectItem);
                     data.setPermissionData66151(permissionData66151);
                 }