feat(tcm): 检验机构作业人员和检测机构作业人员角色调整

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

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.TzsUserPermissionDto;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.SafetyProblemTracing;
+import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.tcm.api.enums.SafetyProblemSourceTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
@@ -53,6 +54,10 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
      * 工作人员资质类型
      */
     private final String ZYRY_TYPE = "permissionData6552";
+    /**
+     * 检验检测资质信息
+     */
+    private final String JYJC_TYPE = "permissionData6667";
 
     /**
      * 需要转换的附件字段 jsonString化字段
@@ -74,6 +79,8 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
     }
     @Autowired
     private SafetyProblemTracingServiceImpl safetyProblemTracingService;
+    @Autowired
+    private TzsUserInfoServiceImpl tzsUserInfoService;
 
     /**
      * 更新资质权限数据
@@ -220,6 +227,9 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
         List<JSONObject> JYRYList = new ArrayList<>();
         List<JSONObject> JCRYList = new ArrayList<>();
         List<JSONObject> ZYRYList = new ArrayList<>();
+        List<JSONObject> JYJCList = new ArrayList<>();
+
+        TzsUserInfo tzsUserInfo = tzsUserInfoService.getBaseMapper().selectById(userSeq);
 
         LambdaQueryWrapper<TzsUserPermission> lambda = new QueryWrapper<TzsUserPermission>().lambda();
         lambda.eq(TzsUserPermission::getUserSeq, userSeq);
@@ -227,14 +237,24 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
 
         for (TzsUserPermission permission : permissionList) {
             String permissionPost = permission.getPermissionPost();
-
-            if (JYRY_TYPE.equals(permissionPost)) {
-                JYRYList.add(this.convertPermissionToJson(permission));
-                continue;
-            }
-            if (JCRY_TYPE.equals(permissionPost)) {
-                JCRYList.add(this.convertPermissionToJson(permission));
-                continue;
+            if (tzsUserInfo.getNewPost().contains("6667")){
+                if (JYRY_TYPE.equals(permissionPost)) {
+                    JYJCList.add(new JSONObject().fluentPutAll(this.convertPermissionToJson(permission)).fluentPut("_qualificationType", "jy"));
+                    continue;
+                }
+                if (JCRY_TYPE.equals(permissionPost)) {
+                    JYJCList.add(new JSONObject().fluentPutAll(this.convertPermissionToJson(permission)).fluentPut("_qualificationType", "jc"));
+                    continue;
+                }
+            }else {
+                if (JYRY_TYPE.equals(permissionPost)) {
+                    JYRYList.add(this.convertPermissionToJson(permission));
+                    continue;
+                }
+                if (JCRY_TYPE.equals(permissionPost)) {
+                    JCRYList.add(this.convertPermissionToJson(permission));
+                    continue;
+                }
             }
             if (ZYRY_TYPE.equals(permissionPost)) {
                 ZYRYList.add(this.convertPermissionToJson(permission));
@@ -243,6 +263,7 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
         result.putIfAbsent(JYRY_TYPE, JYRYList);
         result.putIfAbsent(JCRY_TYPE, JCRYList);
         result.putIfAbsent(ZYRY_TYPE, ZYRYList);
+        result.putIfAbsent(JYJC_TYPE, JYJCList);
         return result;
     }