Bläddra i källkod

项目个人岗位

wangming 10 månader sedan
förälder
incheckning
1a29155c3a

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

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.dao;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.vo.ZhcxOutsideInspectionVo;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
@@ -65,7 +67,7 @@ public interface ZhcxApiDao {
             "<foreach collection=\"ids\" separator=\",\" open=\"(\" close=\")\" item=\"item\"> " +
             "   #{item}" +
             "</foreach>" +
-            " AND DELETED = '0' AND t.STATUS = '正常' "+
+            " AND DELETED = '0' AND t.STATUS = '正常' " +
             "</script>")
     List<Map<String, Object>> getSupervisionJJYBySupervisionId(@Param("ids") List<String> ids);
 
@@ -73,5 +75,16 @@ public interface ZhcxApiDao {
     int getIp(@Param("ip") String ip);
 
     @Insert("INSERT INTO ZHCX_IP (ID,IP) VALUES (#{id},#{ip})")
-    void saveIp(@Param("id")String id,@Param("ip")String ip);
+    void saveIp(@Param("id") String id, @Param("ip") String ip);
+
+    @Select("SELECT " +
+            " po.ID as prjId, " +
+            " po.STATION " +
+            "FROM " +
+            " ZHCX_PROJECT_MANAGE pm " +
+            "JOIN ZHCX_PROJECT_ORGANIZATION po ON " +
+            " pm.ID = po.PID " +
+            "WHERE " +
+            " po.USERID = #{userId}")
+    List<JSONObject> getProjectOrgByUserId(@Param("userId") String userId);
 }

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

@@ -372,6 +372,29 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
             map.put("mySubcontractorZJY", list5);
         }
 
+        //用户在项目中岗位
+        final List<JSONObject> prjOrgList = zhcxApiDao.getProjectOrgByUserId(userId);
+        if(ObjectUtil.isNotEmpty(prjOrgList)) {
+            Map<String, Set<String>> prjOrg = new HashMap<>();
+
+            for(JSONObject row : prjOrgList) {
+                final String prjId = row.getString("prjId");
+                Set<String> orgs = prjOrg.get(prjId);
+
+                if(ObjectUtil.isNull(orgs)) {
+                    orgs = new HashSet<>();
+                }
+                orgs.add(row.getString("STATION"));
+
+                prjOrg.put(prjId, orgs);
+            }
+
+            map.put("prjOrg4User", prjOrg);
+
+        } else {
+            map.put("prjOrg4User", Collections.emptyMap());
+        }
+
 //        List<Map<String, Object>> list5 = zhcxApiDao.getAllOrg();
 //        map.put("allOrg", list5);
         return map;