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

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserInfoService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
@@ -35,6 +36,8 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
 
     Map<String,Object> getCompanyType();
 
+    Map<String,Object> getCompanyTypeForRedis(ReginParams selectedOrgInfo);
+
     Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page);
 
     Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/vo/TzsUserInfoVo.java

@@ -43,6 +43,12 @@ public class TzsUserInfoVo {
     private JSONArray post;
 
     /**
+     * 岗位 （后期post迁移数组至此）
+     */
+    @TableField("new_post")
+    private JSONArray newPost;
+
+    /**
      * 联系电话
      */
     @TableField("phone")

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -181,6 +181,14 @@ public class TzsUserInfoController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getCompanyTypeForRedis")
+    @ApiOperation(httpMethod = "GET", value = "从redis获取当前登录用户单位类型获取，避免多角色的单位获取到多个单位类型", notes = "从redis获取当前登录用户单位类型获取，避免多角色的单位获取到多个单位类型")
+    public ResponseModel<Map<String, Object>> getCompanyTypeForRedis() {
+        ReginParams selectedOrgInfo = getSelectedOrgInfo();
+        return ResponseHelper.buildResponse(tzsUserInfoService.getCompanyTypeForRedis(selectedOrgInfo));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUserType")
     @ApiOperation(httpMethod = "GET", value = "根据单位类型获取人员类型", notes = "根据单位类型获取人员类型")
     public ResponseModel<List<Map<String, Object>>> getUserType(@RequestParam(value = "unitType") String unitType) {

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

@@ -247,6 +247,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         if (!ObjectUtils.isEmpty(tzsUserInfo.getPost())) {
             tzsUserInfoVo.setPost(JSON.parseArray(tzsUserInfo.getPost()));
         }
+        if (!ObjectUtils.isEmpty(tzsUserInfo.getNewPost())) {
+            tzsUserInfoVo.setNewPost(JSON.parseArray(tzsUserInfo.getNewPost()));
+        }
         if (!ObjectUtils.isEmpty(tzsUserInfo.getEquipType())) {
             tzsUserInfoVo.setEquipType(JSON.parseArray(tzsUserInfo.getEquipType()));
         }
@@ -477,6 +480,50 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     }
 
     @Override
+    public Map<String, Object> getCompanyTypeForRedis(ReginParams selectedOrgInfo) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("companyType", null);
+        CompanyBo company = selectedOrgInfo.getCompany();
+        if (ObjectUtils.isEmpty(company)) {
+            return result;
+        }
+        result.put("creditCode", company.getCompanyCode());
+        boolean productCompany = false;
+        boolean useCompany = false;
+        boolean installCompany = false;
+        boolean inspectionCompany = false;
+        String companyType = company.getCompanyType();
+        if (companyType.contains("使用单位") || companyType.contains("个人主体")) {
+            useCompany = true;
+        }
+        if (companyType.contains("充装单位") || companyType.contains("安装改造维修单位") || companyType.contains("制造单位") || companyType.contains("设计单位")) {
+            productCompany = true;
+        }
+        if (companyType.contains("安装改造维修单位")) {
+            installCompany = true;
+        }
+        if (companyType.contains("检验检测机构")) {
+            inspectionCompany = true;
+        }
+        StringBuilder companyTypeStr = new StringBuilder();
+        if (useCompany) {
+            companyTypeStr.append("use-");
+        }
+        if (productCompany) {
+            companyTypeStr.append("pro-");
+        }
+
+        if (installCompany) {
+            companyTypeStr.append("install-");
+        }
+        if (inspectionCompany) {
+            companyTypeStr.append("inspection");
+        }
+        result.put("companyType", companyTypeStr);
+        return result;
+    }
+
+    @Override
     public Page<TzsEquipListDto> getEquipList(String type, String userSeq, TzsEquipListDto dto, Page<TzsEquipListDto> page) {
         List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
         if (companyModels.isEmpty()) {
@@ -779,7 +826,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfo.setAppointDoc(tzsUserInfo.getAppointDoc());
         tzsUserInfo.setRecDate(new Date());
         // 兼容前端只传一个值，并且非json类型的情况
-        JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfo.getPost()) ? tzsUserInfo.getPost() : "[\"" + tzsUserInfo.getPost() + "\"]");
+        JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfo.getNewPost()) ? tzsUserInfo.getNewPost() : "[\"" + tzsUserInfo.getNewPost() + "\"]");
         tzsUserInfo.setNewPost(JSONArray.toJSONString(postArray));
         // 兼容 人员类型为【作业人员】且 【作业项目】含有【电梯修理】项目的为【维保人员】post为“6618”
         JSONArray permissionData6552 = tzsUserInfo.getPermissionData6552();
@@ -791,7 +838,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             }
         }
         tzsUserInfo.setPost(JSONArray.toJSONString(postArray));
-        tzsUserInfo.setPostName(this.setPostName(tzsUserInfo.getPost()));
+        tzsUserInfo.setPostName(this.setPostName(tzsUserInfo.getNewPost()));
         tzsUserInfo = this.createWithModel(tzsUserInfo);
         // 保存资质
         tzsUserPermissionServiceImpl.savePermissionData(tzsUserInfo);
@@ -842,7 +889,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfoDto.setSequenceNbr(rowId);
         tzsUserInfoDto.setRecDate(new Date());
         // 兼容前端只传一个值，并且非json类型的情况
-        JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfoDto.getPost()) ? tzsUserInfoDto.getPost() : "[\"" + tzsUserInfoDto.getPost() + "\"]");
+        JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfoDto.getNewPost()) ? tzsUserInfoDto.getNewPost() : "[\"" + tzsUserInfoDto.getNewPost() + "\"]");
         tzsUserInfoDto.setNewPost(JSONArray.toJSONString(postArray));
         // 兼容 人员类型为【作业人员】且 【作业项目】含有【电梯修理】项目的为【维保人员】post为“6618”
         JSONArray permissionData6552 = tzsUserInfoDto.getPermissionData6552();
@@ -854,7 +901,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             }
         }
         tzsUserInfoDto.setPost(JSONArray.toJSONString(postArray));
-        String postName = this.setPostName(tzsUserInfoDto.getPost());
+        String postName = this.setPostName(tzsUserInfoDto.getNewPost());
         tzsUserInfoDto.setPostName(postName);
         if (!ObjectUtils.isEmpty(selectOne.getAmosUserId())) {
             // 添加新的人员与组的关系