fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlCommonController.java

@@ -186,6 +186,22 @@ public class TlCommonController extends BaseController {
         List<TlIncident> tlIncidents = incidentService.selectTlIncidentList(new TlIncident());
         long unDealTotal = tlIncidents.stream().filter(obj -> "1".equals(obj.getStatus())).count();
         Map<String, Map<String, Integer>> incidentDetailCount = tlIncidents.stream().collect(Collectors.groupingBy(TlIncident::getArea, Collectors.groupingBy(TlIncident::getStatus, Collectors.summingInt(e -> 1))));
+        Map<String, Map<String, Integer>> modifiedMap = incidentDetailCount.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue().entrySet().stream()
+                                .collect(Collectors.toMap(
+                                        e -> {
+                                            if ("1".equals(e.getKey())) {
+                                                return "key1";
+                                            } else if ("2".equals(e.getKey())) {
+                                                return "key2";
+                                            }
+                                            return e.getKey();
+                                        },
+                                        Map.Entry::getValue
+                                ))
+                ));
         Map<String, Integer> incidentCount = tlIncidents.stream().collect(Collectors.groupingBy(TlIncident::getArea, Collectors.summingInt(e -> 1)));
         map.put("unDealTotal", unDealTotal); // 未处理隐患总数
         map.put("incidentTotal", tlIncidents.size()); // 隐患总数
@@ -202,7 +218,7 @@ public class TlCommonController extends BaseController {
 
             IncidentDetailAreaNum incidentDetailAreaNum = new IncidentDetailAreaNum();
             incidentDetailAreaNum.setAreaName(area.getAreaName());
-            incidentDetailAreaNum.setDetail(incidentDetailCount.get(Convert.toStr(area.getId())));
+            incidentDetailAreaNum.setDetail(modifiedMap.get(Convert.toStr(area.getId())));
             incidentDetailCounts.add(incidentDetailAreaNum);
         }
         map.put("areaIncidentTotal", areaIncidentTotals); // 各区域隐患占比

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlIncidentController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.qdtl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.annotation.Log;
@@ -97,6 +98,12 @@ public class TlIncidentController extends BaseController {
         } else if (roleSet.contains("xun_manage")) {
             tlIncident.setAcceptUser(getUsername());
         }
+        if (StrUtil.isBlank(tlIncident.getBeginTime())) {
+            tlIncident.setBeginTime(DateUtil.thisYear() + "-" + (DateUtil.thisMonth() + 1) + "-01 00:00:00");
+        }
+        if (StrUtil.isBlank(tlIncident.getEndTime())) {
+            tlIncident.setEndTime(DateUtil.now());
+        }
         List<TlIncident> list = tlIncidentService.selectTlIncidentList(tlIncident);
         for (TlIncident incident : list) {
             if (StrUtil.isNotBlank(incident.getPics())) {

ruoyi-system/src/main/java/com/ruoyi/qdtl/domain/TlIncident.java

@@ -105,6 +105,26 @@ public class TlIncident extends BaseEntity {
 
     private String queryFlag;
 
+    private String beginTime;
+
+    private String endTime;
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     public String getQueryFlag() {
         return queryFlag;
     }

ruoyi-system/src/main/resources/mapper/qdtl/TlIncidentMapper.xml

@@ -65,6 +65,12 @@
             <if test="dealUser != null  and dealUser != ''">and deal_user = #{dealUser}</if>
             <if test="dealUserName != null  and dealUserName != ''">and deal_user_name like concat('%', #{dealUserName}, '%')</if>
             <if test="dealTime != null ">and deal_time = #{dealTime}</if>
+            <if test="beginTime != null and beginTime != ''">
+                AND happen_time &gt;= #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND happen_time &lt;= #{endTime}
+            </if>
         </where>
         order by happen_time desc
     </select>