app首页统计修改

wangqian
1 parent 10ec917d
Showing 4 changed files with 43 additions and 35 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/homepage/vo/WorkOrderTrendRespVo.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/MaintainSummaryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -19,7 +19,7 @@ public class WorkOrderTrendRespVo {
     private String companyName;
-    private String totalCount;
+    private Integer totalCount;
 }
@@ -99,7 +99,7 @@ public interface HomepageSummaryMapper  extends BaseMapperX&lt;DepartmentCostDO&gt; {
      * @Description 工单趋势
      * @Date 2025/12/30 23:40
      */
-    List<WorkOrderTrendRespVo> countWorkOrderTrend(@Param("companyId") Long companyId, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("queryState") String queryState);
+    List<WorkOrderTrendRespVo> countWorkOrderTrend(@Param("companyId") Long companyId, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("queryState") String queryState, @Param("currentDate") String currentDate);
     /**
      * @Author wangqian
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.service.homepage;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
+import com.zteits.urbanops.framework.common.util.date.DateUtils;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.*;
@@ -20,6 +21,9 @@ import org.springframework.stereotype.Service;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -38,9 +42,12 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
     @Resource
     private DictDataApi dictDataApi;
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+            .withZone(ZoneId.of("Asia/Shanghai"));
+
     @Override
     public Map<String, Object> getSummary() {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if(null == companyId || companyId == 0L || companyId == 100L){
             companyId = null;
         }
@@ -65,13 +72,13 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
     @Override
     public Map<String, Object> getWorkTaskTrend(HomePageSummaryReqVO req) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if(null == companyId || companyId == 0L || companyId == 100L){
             companyId = null;
         }
         Map<String,Object> chartData = new HashMap<>();
         //1、数据结构初始化
-        List<String> days = getDays(req.beginTime, req.endTime);
+        List<String> days = getDays(req.getBeginTime(), req.getEndTime());
         List<DictDataRespDTO> dictDataList = dictDataApi.getDictDataList(DictTypeConstants.BUSINESS_LINE);
         List<String> allBusiLines = dictDataList.stream().map(DictDataRespDTO::getValue).collect(Collectors.toList());
         Map<String, List<CommitTaskStatisticsRespVo>> defaultData = addTaskDefaultData(req, days, dictDataList);
@@ -188,7 +195,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
      */
     @Override
     public Map<String, Object> getWorkOrderRatio(HomePageSummaryReqVO req) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if(null == companyId || companyId == 0L || companyId == 100L){
             companyId = null;
         }
@@ -279,7 +286,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
      */
     @Override
     public Map<String, CommitWorkOrderRespVo> getWorkOrderDistribution(HomePageSummaryReqVO req) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if(null == companyId || companyId == 0L || companyId == 100L){
             companyId = null;
         }
@@ -345,7 +352,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
     @Override
     public Map<String, CommitWorkOrderSourceRespVo> getWorkOrderDistributionBySource(HomePageSummaryReqVO req) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if(null == companyId || companyId == 0L || companyId == 100L){
             companyId = null;
         }
@@ -419,7 +426,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
      */
     @Override
     public List<Map<String, Object>> getWorkOrderHeatmap() {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if(null == companyId || companyId == 0L || companyId == 100L){
             companyId = null;
         }
@@ -433,7 +440,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
      */
     @Override
     public Map<String, Object> getWorkOrderTrend(HomePageSummaryReqVO req) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
         if(null == companyId || companyId == 0L || companyId == 100L){
             companyId = null;
         }
@@ -445,7 +452,10 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
         // 1. 初始化响应Map
         Map<String, List<WorkOrderTrendRespVo>>  respMap = addDefaultData(req);
         // 2、汇总工单数量
-        List<WorkOrderTrendRespVo> countList = homepageSummaryMapper.countWorkOrderTrend(companyId, req.getBeginTime(), req.getEndTime(), req.getQueryState());
+        LocalDate currentLocalDate = LocalDate.now(ZoneId.of("Asia/Shanghai"));
+        // 2. 格式化为yyyy-MM-dd字符串
+        String currentDate = currentLocalDate.format(DATE_FORMATTER);
+        List<WorkOrderTrendRespVo> countList = homepageSummaryMapper.countWorkOrderTrend(companyId, req.getBeginTime(), req.getEndTime(), req.getQueryState(), currentDate);
         Map<String, List<WorkOrderTrendRespVo>> busiLineGroup;
         if (CollectionUtils.isNotEmpty(countList)) {
             busiLineGroup = countList.stream()
@@ -475,7 +485,7 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
             // 3.2 构建「联合标识-真实totalCount」的Map，提高匹配效率
             // 联合标识：companyId_dateValue（因为busiLine已匹配，内部无需重复拼接）
-            Map<String, String> realCountMap = realVoList.stream()
+            Map<String, Integer> realCountMap = realVoList.stream()
                     .filter(realVo -> realVo.getCompanyId() != null && realVo.getDateValue() != null) // 过滤空值，避免异常
                     .collect(Collectors.toMap(
                             // 键：companyId + "_" + dateValue（唯一标识）
@@ -513,18 +523,17 @@ public class MaintainSummaryServiceImpl implements MaintainSummaryService {
             companyList.forEach(resp ->{
                 WorkOrderTrendRespVo type = new WorkOrderTrendRespVo();
                 type.setDateValue(dayy);
-                type.setTotalCount("0"); // 默认总数为0
+                type.setTotalCount(0); // 默认总数为0
                 type.setCompanyId(String.valueOf(resp.getId()));
                 type.setCompanyName(resp.getName());
                 newList.add(type);
             });
         });
-        List<DictDataRespDTO> dictDataList = dictDataApi.getDictDataList(DictTypeConstants.BUSINESS_LINE);
-        List<String> busiLines = dictDataList.stream().map(DictDataRespDTO::getValue).collect(Collectors.toList());
-
+        String busiLines = SecurityFrameworkUtils.getBusiLine();
+        String[] busiLineArray = busiLines.split(",");
         // 6. 为每个业务线生成专属列表并赋值busiLine
-        for (String type : busiLines) {
+        for (String type : busiLineArray) {
             // 核心：通过map拷贝对象并设置busiLine，避免引用共享
             List<WorkOrderTrendRespVo> busiLineList = newList.stream()
                     // 拷贝原对象，创建新对象并设置当前业务线
@@ -254,35 +254,34 @@
     </select>
     <select id="countWorkOrderTrend" resultType="com.zteits.urbanops.module.garden.controller.admin.homepage.vo.WorkOrderTrendRespVo">
-        select v.date_value as dateValue,
+        SELECT
+        DATE_FORMAT(t.create_time , '%Y-%m-%d') as dateValue,
         t.busi_line as busiLine,
         t.worker_company_id as companyId,
         <choose>
             <when test='queryState != null and queryState eq "1"'>
-                sum(case when v.date_value = DATE_FORMAT(t.create_time , '%Y-%m-%d') then 1 else 0 end) as totalCount
+               sum(CASE WHEN DATE_FORMAT(t.create_time , '%Y-%m-%d') = #{currentDate} THEN 1 ELSE 0 END) as totalCount
             </when>
             <when test='queryState != null and queryState eq "2"'>
-                sum(case when t.buz_status != '200' then 1 else 0 end) as totalCount
+                sum(CASE WHEN t.buz_status != '200' THEN 1 ELSE 0 END) as totalCount
             </when>
             <when test='queryState != null and queryState eq "3"'>
-                sum(case when t.buz_status = '200' then 1 else 0 end) as totalCount
+                sum(CASE WHEN t.buz_status = '200' THEN 1 ELSE 0 END) as totalCount
             </when>
         </choose>
-        from view_statics_times v
-        left join workorder_main_info t
-        on v.date_value = DATE_FORMAT(t.create_time , '%Y-%m-%d') and deleted =0
-        <if test="companyId != null">
-            and t.worker_company_id = #{companyId}
+        FROM workorder_main_info t
+        WHERE deleted = 0
+        <if test="companyId != null and companyId != ''">
+            AND t.worker_company_id = #{companyId}
         </if>
-        <where>
-            <if test="beginTime != null and beginTime != ''">
-                AND v.date_value >= #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND v.date_value &lt;= #{endTime}
-            </if>
-        </where>
-        group by v.date_value,t.busi_line,t.worker_company_id
+        <if test="beginTime != null and beginTime != ''">
+            AND t.create_time >= STR_TO_DATE(#{beginTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            <!-- 优化：结束时间匹配到当日23:59:59，覆盖全天 -->
+            AND t.create_time &lt;= STR_TO_DATE(#{endTime}, '%Y-%m-%d')
+        </if>
+        GROUP BY DATE_FORMAT(t.create_time , '%Y-%m-%d'), t.busi_line, t.worker_company_id
     </select>
     <!--已完成任务数量-->