增加进系统时同步获取部分内容

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxApiDao.java

@@ -33,4 +33,39 @@ public interface ZhcxApiDao {
 
     @Select("SELECT * FROM ZHCX_SUBCONTRACTOR_MANAGE WHERE ID IN (SELECT PID FROM ZHCX_SUBCONTRACTOR_MANAGE_USER WHERE USERID = #{id} AND DELETED = '0') AND DELETED = '0'")
     List<Map<String, Object>> getSubcontractorByUserId(@Param("id") String id);
+
+
+    @Select("<script>" +
+            "  SELECT  " +
+            "  su.*  " +
+            "  FROM  " +
+            "  SYS_USER su  " +
+            "  JOIN SYS_USER_ROLE sur ON  " +
+            "  sur.USERID = su.ID  " +
+            "  AND sur.DELETED = '0'  " +
+            "  JOIN SYS_ROLE sr ON  " +
+            "  sr.ID = sur.ROLEID  " +
+            "  AND sr.CODE = 'role076'  " +
+            "  AND sr.DELETED = '0'  " +
+            "  JOIN ZHCX_SUBCONTRACTOR_MANAGE_USER zsmu ON  " +
+            "  zsmu.USERID = su.ID  " +
+            "  AND zsmu.DELETED = '0'  " +
+            "  JOIN ZHCX_SUBCONTRACTOR_MANAGE zsm ON  " +
+            "  zsm.ID = zsmu.PID  " +
+            "  AND zsm.ID IN " +
+            "<foreach collection=\"ids\" separator=\",\" open=\"(\" close=\")\" item=\"item\"> " +
+            "   #{item}" +
+            "</foreach>" +
+            "  AND zsm.DELETED = '0'" +
+            "</script>")
+    List<Map<String, Object>> getSubcontractorZJYBySubcontractId(@Param("ids") List<String> ids);
+
+    @Select("<script>" +
+            " SELECT * FROM ZHCX_SUPERVISION_CUSTOM_USER_MANAGE t WHERE PID IN " +
+            "<foreach collection=\"ids\" separator=\",\" open=\"(\" close=\")\" item=\"item\"> " +
+            "   #{item}" +
+            "</foreach>" +
+            " AND DELETED = '0' AND t.STATUS = '正常' "+
+            "</script>")
+    List<Map<String, Object>> getSupervisionJJYBySupervisionId(@Param("ids") List<String> ids);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxApiService.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.service;
 import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.dto.RectifyApiDataDto;
 import com.rongwei.bsentity.vo.ZhcxOutsideInspectionVo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 
 import java.util.List;
@@ -29,7 +30,7 @@ public interface ZhcxApiService {
 
     R forgetResetPwd(Map<String, Object> map);
 
-    Map<String, Object> getProjectStaticData(String userId);
+    Map<String, Object> getProjectStaticData(SysUserVo currUser);
 
     void syncBsOrgData();
 

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxApiServiceImpl.java

@@ -20,6 +20,7 @@ import com.rongwei.commonservice.service.RedisService;
 import com.rongwei.commonservice.service.SysConfigService;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwadmincommon.system.service.SysUserService;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.CheckPasswordUtils;
 import com.rongwei.rwcommon.utils.RsaUtil;
@@ -339,28 +340,40 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
     }
 
     @Override
-    public Map<String, Object> getProjectStaticData(String userId) {
+    public Map<String, Object> getProjectStaticData(SysUserVo user) {
+        String userId = user.getId();
         Map<String, Object> map = new HashMap<>();
-        // 监理用户
-        LambdaQueryWrapper<ZhcxSupervisionCustomUserManageDo> wrapper1 = Wrappers.lambdaQuery();
-        wrapper1.eq(ZhcxSupervisionCustomUserManageDo::getUserid, userId);
-        wrapper1.eq(ZhcxSupervisionCustomUserManageDo::getDeleted, "0");
-        List<ZhcxSupervisionCustomUserManageDo> list1 = supervisionUserService.list(wrapper1);
-        map.put("supervisionUser", list1);
+        // 本人的监理用户信息
+//        LambdaQueryWrapper<ZhcxSupervisionCustomUserManageDo> wrapper1 = Wrappers.lambdaQuery();
+//        wrapper1.eq(ZhcxSupervisionCustomUserManageDo::getUserid, userId);
+//        wrapper1.eq(ZhcxSupervisionCustomUserManageDo::getDeleted, "0");
+//        List<ZhcxSupervisionCustomUserManageDo> list1 = supervisionUserService.list(wrapper1);
+//        map.put("supervisionUser", list1);
         // 监理公司
-        List<Map<String, Object>> list2 = zhcxApiDao.getSupervisionByUserId(userId);
-        map.put("supervision", list2);
-
+        List<Map<String, Object>> list1 = zhcxApiDao.getSupervisionByUserId(userId);
+        map.put("supervision", list1);
+        if (!list1.isEmpty()) {
+            // 获取当前登陆人所属监理公司下面的所有检验员
+            List<String> ids = list1.stream().map(temprow -> (String)temprow.get("ID")).collect(Collectors.toList());
+            List<Map<String, Object>> list2 = zhcxApiDao.getSupervisionJJYBySupervisionId(ids);
+            map.put("mySupervisionJJY", list2);
+        }
         // 分包商用户
-        List<Map<String, Object>> list3 = zhcxApiDao.getSubcontractorManageUserByUserId(userId);
-        map.put("subcontractorUser", list3);
+//        List<Map<String, Object>> list3 = zhcxApiDao.getSubcontractorManageUserByUserId(userId);
+//        map.put("subcontractorUser", list3);
 
         // 分包商公司
         List<Map<String, Object>> list4 = zhcxApiDao.getSubcontractorByUserId(userId);
         map.put("subcontractor", list4);
+        if (!list4.isEmpty()) {
+            // 获取当前登陆人所属分包商下的所有自检员
+            List<String> ids = list4.stream().map(temprow -> (String)temprow.get("ID")).collect(Collectors.toList());
+            List<Map<String, Object>> list5 = zhcxApiDao.getSubcontractorZJYBySubcontractId(ids);
+            map.put("mySubcontractorZJY", list5);
+        }
 
-        List<Map<String, Object>> list5 = zhcxApiDao.getAllOrg();
-        map.put("org", list5);
+//        List<Map<String, Object>> list5 = zhcxApiDao.getAllOrg();
+//        map.put("allOrg", list5);
         return map;
     }
 

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxApiController.java

@@ -138,7 +138,7 @@ public class ZhcxApiController {
             if (currUser == null) {
                 return R.ok();
             }
-            Map<String, Object> userMap = zhcxApiService.getProjectStaticData(currUser.getId());
+            Map<String, Object> userMap = zhcxApiService.getProjectStaticData(currUser);
             return R.ok(userMap);
         } catch (Exception e) {
             log.error(StringUtils.spliceErrorMsg(e), e.fillInStackTrace());