app首页统计修改

wangqian
1 parent fef7a423
Showing 2 changed files with 9 additions and 9 deletions
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
@@ -91,12 +91,12 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
                     Integer inspTotal = Objects.isNull(dayVo.getInspTotal()) ? 0 : dayVo.getInspTotal();
                     Integer woTotal = Objects.isNull(dayVo.getWoTotal()) ? 0 : dayVo.getWoTotal();
  
-                    Integer mtUnfinished = Objects.isNull(dayVo.getMtUnfinished()) ? 0 : dayVo.getMtUnfinished();
-                    Integer inspUnfinished = Objects.isNull(dayVo.getInspUnfinished()) ? 0 : dayVo.getInspUnfinished();
-                    Integer woUnfinished = Objects.isNull(dayVo.getWoUnfinished()) ? 0 : dayVo.getWoUnfinished();
+                    Integer mtCompleted = Objects.isNull(dayVo.getMtCompleted()) ? 0 : dayVo.getMtCompleted();
+                    Integer inspCompleted = Objects.isNull(dayVo.getInspCompleted()) ? 0 : dayVo.getInspCompleted();
+                    Integer woCompleted = Objects.isNull(dayVo.getWoCompleted()) ? 0 : dayVo.getWoCompleted();
                     // 计算赋值
-                    vo.setCompletedNum(mtTotal + inspTotal + woTotal);
-                    vo.setCountpendingNum(mtUnfinished + inspUnfinished + woUnfinished);
+                    vo.setCompletedNum(mtCompleted + inspCompleted + woCompleted);
+                    vo.setCountpendingNum(mtTotal + inspTotal + woTotal);
                 }
             });
         }
@@ -236,7 +236,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
             TaskStatisticsDO statisticsDO = new TaskStatisticsDO();
             statisticsDO.setBusiDate(busiDate);
             statisticsDO.setUserId(userId);
-            statisticsDO.setUserName(statisticsDO.getUserName());
+            statisticsDO.setUserName(adminUserRespDTO.getNickname());
             //statisticsDO.setCompanyId();
             statisticsDO.setDeptId(adminUserRespDTO.getDeptId());
             //2、查询巡查任务数量及已完成数量
@@ -520,7 +520,7 @@
             AND a.begin_time  &lt;= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND a.begin_time >= #{endTime}
+            AND a.end_time >= #{endTime}
         </if>
         GROUP BY role_id
     </select>
@@ -529,7 +529,7 @@
     <select id="countWorkOrderPending"  resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.CommonTaskStatusVo" >
         select
             t.ASSIGNEE_ as userId,
-            count(*)
+            count(*) AS totalCount
         FROM act_ru_task t
                  LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0
         WHERE  t.SUSPENSION_STATE_ = 1
@@ -543,7 +543,7 @@
     </select>
     <!--工单已办数量-->
     <select id="countWorkOrderCompleted"  resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.CommonTaskStatusVo" >
-        select t.userId,count(*)
+        select t.userId,count(*) AS totalCount
         FROM (
              select t.ASSIGNEE_ as userId,
                  ROW_NUMBER() OVER (