add： 办结时间

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -208,6 +208,7 @@ public class IncidentController extends BaseController {
             .orderByAsc(IncidentProcess::getCreateTime));
         String distributeTime = "";
         String dealTime = "";
+        String dealEndTime = "";
         if (!"dev".equals(env)) {
             for (IncidentProcess incidentProcess : list) {
                 // 处理首次派发和首页处理的时间
@@ -217,6 +218,9 @@ public class IncidentController extends BaseController {
                 if (StrUtil.isBlank(dealTime) && incidentProcess.getIncidentStatus() == 3 && !StrUtil.contains(incidentProcess.getDes(), "再次派发")) {
                     dealTime = DateUtil.formatDateTime(incidentProcess.getCreateTime());
                 }
+                if (StrUtil.isBlank(dealEndTime) && incidentProcess.getIncidentStatus() == 6 && StrUtil.contains(incidentProcess.getDes(), "事件办结")) {
+                    dealEndTime = DateUtil.formatDateTime(incidentProcess.getCreateTime());
+                }
 
                 if (incidentProcess.getStatus() == 1) {
                     // 查询阅读情况
@@ -252,6 +256,7 @@ public class IncidentController extends BaseController {
         map.put("resource", resourceDetailService.queryResourceAvailable(id));
         incidentVo.setDistributeTime(distributeTime);
         incidentVo.setDealTime(dealTime);
+        incidentVo.setDealEndTime(dealEndTime);
         map.put("baseInfo", incidentVo);
         return AjaxResult.success(map);
     }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentVo.java

@@ -196,5 +196,9 @@ public class IncidentVo {
      * 首次派发和处置时间
      */
     private String distributeTime;
+    // 首次处置时间
     private String dealTime;
+    // 办结时间
+    private String dealEndTime;
+
 }