大数据统计接口

src/main/java/com/cm/inspection/controller/app/resources/enterprise/EnterpriseCountController.java

@@ -122,8 +122,15 @@ public class EnterpriseCountController extends AbstractController {
             for (UserResourceBO userResourceBO : userList) {
                 userId.add(userResourceBO.getUserId());
             }
-            List<String> enterpriseIds = eoosService.listEnterpriseIdOfUserIds(userId);
-            params.put("enterpriseIds",enterpriseIds);
+            if(userId.size() > 0){
+                List<String> enterpriseIds = eoosService.listEnterpriseIdOfUserIds(userId);
+                params.put("enterpriseIds",enterpriseIds);
+            }else{
+                List<String> enterpriseIdNull = new ArrayList<>();
+                enterpriseIdNull.add("11");
+                params.put("enterpriseIds",enterpriseIdNull);
+            }
+
         }
         page.setParams(params);
 

src/main/java/com/cm/inspection/controller/app/resources/enterpriseofgridoperator/enterpriseofgridoperatorCountController.java

@@ -39,6 +39,8 @@ public class enterpriseofgridoperatorCountController extends AbstractController
     private IEnterpriseOfGridOperatorService ieoService;
     @Autowired
     private IGridPersonnelService gridPersonnelService;
+    @Autowired
+    private IEnterpriseOfGridOperatorService eoosService;
 
 
 
@@ -90,6 +92,14 @@ public class enterpriseofgridoperatorCountController extends AbstractController
     @GetMapping("listpage")
     public SuccessResultList<List<GridPersonnelDTO>> listPage(ListPage page) throws SearchException, UnsupportedEncodingException {
         Map<String, Object> params = requestParams();
+        if(params.get("groupId") != null){
+            List<String> userId = new ArrayList<>();
+            List<UserResourceBO> userList = groupService.listUser(params.get("groupId").toString());
+            for (UserResourceBO userResourceBO : userList) {
+                userId.add(userResourceBO.getUserId());
+            }
+            params.put("groupUserIds",userId);
+        }
         page.setParams(params);
         return gridPersonnelService.listPage(page);
     }

src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml

@@ -264,6 +264,12 @@
                 t1.user_id = #{userIds[${index}]}
             </foreach>
         </if>
+        <if test="groupUserIds != null and groupUserIds.size > 0">
+        AND
+            <foreach collection="groupUserIds" index="index" open="(" separator="OR" close=")">
+                t1.user_id = #{groupUserIds[${index}]}
+            </foreach>
+        </if>
         <if test="level != null">
         AND
             t1.level = #{level}