app首页统计修改

wangqian
1 parent 2de14c23
Showing 4 changed files with 87 additions and 55 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/taskstatistics/TaskStatisticsDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -32,14 +32,24 @@ public class TaskStatisticsDO extends BaseDO {
      */
     private String busiDate;
     /**
+     * 业务线
+     */
+    private String busiLine;
+    /**
      * 归属(一级部门id)
      */
-    private Integer companyId;
+    private Long companyId;
+
+    private String companyName;
     /**
      * 部门ID(道路负责部门id)
      */
     private Long deptId;
     /**
+     * 角色
+     */
+    private String roleIds;
+    /**
      * 用户id
      */
     private Long userId;
@@ -83,6 +93,7 @@ public class TaskStatisticsDO extends BaseDO {
      * 工单未完成数
      */
     private Integer woUnfinished;
+
     /**
      * 备注
      */
@@ -10,6 +10,7 @@ import com.zteits.urbanops.module.garden.controller.app.homepage.vo.CommonTaskSt
 import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskCompletionStatusRspVo;
 import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo;
 import com.zteits.urbanops.module.garden.dal.dataobject.departmentcost.DepartmentCostDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.taskstatistics.TaskStatisticsDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -199,5 +200,10 @@ public interface HomepageSummaryMapper  extends BaseMapperX&lt;DepartmentCostDO&gt; {
      * @Return java.util.List<java.util.Map<java.lang.Long,java.lang.Integer>>
      */
     List<CommonTaskStatusVo> countWorkOrderCompleted(@Param("beginTime") String beginTime, @Param("endTime") String endTime);
-
+    /**
+     * @Author wangqian
+     * @Description 获取用户初始化数据
+     * @Date 2026/1/12 0:45
+     */
+    List<TaskStatisticsDO> getUserAll(@Param("busiDate") String busiDate);
 }
 package com.zteits.urbanops.module.garden.service.homepage;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.esotericsoftware.minlog.Log;
@@ -137,13 +138,14 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         if (StringUtils.isEmpty(busiDate)) {
             busiDate = yesterday.format(formatter);
         }
+        List<TaskStatisticsDO> taskStatisticsList = initUserData(busiDate);
+
         String beginTime = busiDate + " 00:00:00";
         String endTime = busiDate + " 23:59:59";
         Log.info("昨天开始时间：" + beginTime);
         Log.info("昨天结束时间：" + endTime);
         //获取正常用户
-        List<AdminUserRespDTO> userList = userApi.getUserList();
-        if (CollectionUtils.isEmpty(userList)){
+        if (CollectionUtils.isEmpty(taskStatisticsList)){
             return;
         }
         //巡查已完成
@@ -189,56 +191,26 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
                         (oldVo, newVo) -> newVo,
                         HashMap::new
                 ));
-//        //巡查计划数
-//        List<CommonTaskStatusVo> inspTotal = homepageSummaryMapper.countInspPendingTask(beginTime, endTime);
-//        Map<Long, CommonTaskStatusVo> inspTotalMap = inspTotal.stream()
-//                .filter(vo -> Objects.nonNull(vo))
-//                .collect(Collectors.toMap(
-//                        // Map的key：从VO中提取Long类型的roleId（核心修正点）
-//                        CommonTaskStatusVo::getRoleId,
-//                        vo -> vo,
-//                        (oldVo, newVo) -> newVo,
-//                        HashMap::new
-//                ));
-//        //养护计划数量
-//        List<CommonTaskStatusVo>  mtTotal = homepageSummaryMapper.countMtPendingTask(beginTime, endTime);
-//        Map<Long, CommonTaskStatusVo> mtTotalMap = mtTotal.stream()
-//                .filter(vo -> Objects.nonNull(vo))
-//                .collect(Collectors.toMap(
-//                        // Map的key：从VO中提取Long类型的roleId（核心修正点）
-//                        CommonTaskStatusVo::getRoleId,
-//                        vo -> vo,
-//                        (oldVo, newVo) -> newVo,
-//                        HashMap::new
-//                ));
+
         List<TaskStatisticsDO> taskStatisticsDOList = new ArrayList<>();
         //根据用户查询任务数量
-        for (AdminUserRespDTO adminUserRespDTO : userList) {
-            Long userId = adminUserRespDTO.getId();
-            Long deptId = adminUserRespDTO.getDeptId();
-            List<Long> roles = roleApi.getRoleIdsByUserId(userId);
-            if (CollectionUtils.isEmpty(roles)) {
-                continue;
-            }
-            if (roles.contains(1L)) {//超级管理员
-                continue;
-            }
-            if (roles.contains(2L)) {//普通角色
-                continue;
-            }
-            if (roles.contains(159L)) {//管理员
-                continue;
-            }
-            if (roles.contains(168L)) {//子公司管理员
-                continue;
-            }
-            //deptApi.get
+        for (TaskStatisticsDO statisticsVo : taskStatisticsList) {
+            Long userId = statisticsVo.getUserId();
+            Long deptId = statisticsVo.getDeptId();
+            String[] roles = statisticsVo.getRoleIds().split(",");
             TaskStatisticsDO statisticsDO = new TaskStatisticsDO();
-            statisticsDO.setBusiDate(busiDate);
-            statisticsDO.setUserId(userId);
-            statisticsDO.setUserName(adminUserRespDTO.getNickname());
-            //statisticsDO.setCompanyId();
-            statisticsDO.setDeptId(adminUserRespDTO.getDeptId());
+            BeanUtil.copyProperties(statisticsVo, statisticsDO);
+            //初始化参数
+            statisticsDO.setInspTotal(0);
+            statisticsDO.setInspUnfinished(0);
+            statisticsDO.setInspCompleted(0);
+            statisticsDO.setMtTotal(0);
+            statisticsDO.setMtCompleted(0);
+            statisticsDO.setMtUnfinished(0);
+            statisticsDO.setWoTotal(0);
+            statisticsDO.setWoCompleted(0);
+            statisticsDO.setWoUnfinished(0);
+
             //2、查询巡查任务数量及已完成数量
             Integer inspTotalCount = 0;
             List<CommonTaskStatusVo> inspTotal = homepageSummaryMapper.countInspPendingTask(beginTime, endTime, deptId);
@@ -251,7 +223,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
                             (oldVo, newVo) -> newVo,
                             HashMap::new
                     ));
-            for (Long role : roles) {
+            for (String role : roles) {
                 CommonTaskStatusVo countVo = inspTotalMap.get(role);
                 if (null != countVo) {
                     inspTotalCount = countVo.getTotalCount();
@@ -277,7 +249,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
                             HashMap::new
                     ));
             //3、查询养护计划任务数量
-            for (Long role : roles) {
+            for (String role : roles) {
                 CommonTaskStatusVo countVo  = mtTotalMap.get(role);
                 if (null != countVo) {
                     mtTotalCount = countVo.getTotalCount();
@@ -293,12 +265,12 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
             //4、工单任务数量
             Integer woCompCount = Optional.ofNullable(woCompletedMap)
-                    .map(map -> map.get(userId))
+                    .flatMap(map -> Optional.ofNullable(map.get(userId)))
                     .map(CommonTaskStatusVo::getTotalCount)
                     .orElse(0);
             statisticsDO.setWoCompleted(woCompCount);
             Integer woUnfiCount = Optional.ofNullable(woPendingMap)
-                    .map(map -> map.get(userId))
+                    .flatMap(map -> Optional.ofNullable(map.get(userId)))
                     .map(CommonTaskStatusVo::getTotalCount)
                     .orElse(0);
             statisticsDO.setWoUnfinished(woUnfiCount);
@@ -315,6 +287,20 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         //批量保存
         taskStatisticsMapper.insertBatch(taskStatisticsDOList);
     }
+    /**
+     * @Author wangqian
+     * @Description 初始化对象集合
+     * @Date 2026/1/11 23:55
+     */
+    private List<TaskStatisticsDO> initUserData(String busiDate) {
+        List<TaskStatisticsDO> taskStatisticsList = new ArrayList<>();
+        //获取正常用户
+        List<TaskStatisticsDO> userList = homepageSummaryMapper.getUserAll(busiDate);
+        if (CollectionUtils.isEmpty(userList)){
+            return taskStatisticsList;
+        }
+        return userList;
+    }
     private List<TaskCompletionStatusRspVo> addTaskDefaultData(List<String> days){
         List<TaskCompletionStatusRspVo> newList = new ArrayList<>();
@@ -559,4 +559,33 @@
          ) t
         group by t.userId
     </select>
+
+    <!--获取用户信息-->
+    <select id="getUserAll"  resultType="com.zteits.urbanops.module.garden.dal.dataobject.taskstatistics.TaskStatisticsDO" >
+        WITH RECURSIVE dept_recursive AS (
+            -- 基准层：二级公司（parent_id='100'）
+            SELECT id, name, parent_id, id as companyId, name as companyName
+            FROM system_dept
+            WHERE parent_id = '100'
+            UNION ALL
+            -- 递归层：子部门关联上级，继承二级公司信息
+            SELECT d.id, d.name, d.parent_id, dr.companyId, dr.companyName
+            FROM system_dept d
+                     INNER JOIN dept_recursive dr ON d.parent_id = dr.id
+        )
+        -- 关联用户表查询
+        SELECT
+            #{busiDate} as busiDate,
+            u.busi_line as busiLine,
+            u.dept_id as deptId,
+            dr.companyId, -- 二级归属公司ID
+            dr.companyName, -- 二级归属公司名称
+            GROUP_CONCAT(r.role_id SEPARATOR ',') AS roleIds,
+            u.id as userId,
+            u.nickname as username
+        FROM system_users u
+                 INNER JOIN system_user_role r ON u.id = r.user_id
+                 INNER JOIN dept_recursive dr ON u.dept_id = dr.id
+        GROUP BY u.id, u.nickname, u.dept_id, u.busi_line, dr.companyId, dr.companyName;
+    </select>
 </mapper>