fix

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

@@ -9,9 +9,13 @@ import java.util.concurrent.TimeUnit;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zhdd.domain.IncidentProcess;
 import com.ruoyi.zhdd.domain.IncidentTask;
+import com.ruoyi.zhdd.domain.Plan;
 import com.ruoyi.zhdd.domain.bo.IncidentTaskBo;
+import com.ruoyi.zhdd.domain.vo.PlanVo;
 import com.ruoyi.zhdd.service.IIncidentProcessService;
 import com.ruoyi.zhdd.service.IIncidentTaskService;
+import com.ruoyi.zhdd.service.IPlanService;
+import com.ruoyi.zhdd.service.IPlanTaskService;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -56,6 +60,10 @@ public class IncidentController extends BaseController {
 
     private final IIncidentProcessService iIncidentProcessService;
 
+    private final IPlanTaskService planTaskService;
+
+    private final IPlanService planService;
+
     /**
      * 查询事件基础列表
      */
@@ -87,7 +95,15 @@ public class IncidentController extends BaseController {
     public AjaxResult<Map<String, Object>> getInfo(@NotNull(message = "主键不能为空")
                                           @PathVariable("id") Long id) {
         Map<String, Object> map = new HashMap<>();
-        map.put("baseInfo", iIncidentService.queryById(id));
+        IncidentVo incidentVo = iIncidentService.queryById(id);
+        map.put("baseInfo", incidentVo);
+        // 查询所属预案
+        PlanVo voOne = planService.getVoOne(Wrappers.<Plan>lambdaQuery().eq(Plan::getType, incidentVo.getType()).eq(Plan::getCreateDept, incidentVo.getCreateDept()));
+        if (voOne != null) {
+            map.put("baseTask", planTaskService.queryPlanTaskByPlanId(voOne.getId()));
+        } else {
+            map.put("baseTask", null);
+        }
         map.put("task", incidentTaskService.list(Wrappers.<IncidentTask>lambdaQuery().eq(IncidentTask::getIncidentId, id)));
         map.put("process", iIncidentProcessService.list(Wrappers.<IncidentProcess>lambdaQuery()
             .eq(IncidentProcess::getIncidentId, id).orderByDesc(IncidentProcess::getCreateTime)));

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -113,6 +113,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
             .antMatchers("/actuator/**").anonymous()
             // 应急指挥相关
             .antMatchers("/zhdd/**").permitAll()
+            .antMatchers("/system/dict/**").permitAll()
             .antMatchers("/common/upload").permitAll()
             // 除上面外的所有请求全部需要鉴权认证
             .anyRequest().authenticated()

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

@@ -149,4 +149,8 @@ public class IncidentVo {
     @ExcelProperty(value = "创建时间")
     @ApiModelProperty("创建时间")
     private Date createTime;
+
+    @ExcelProperty(value = "更新时间")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IPlanTaskService.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预案任务管理Service接口
@@ -53,4 +54,6 @@ public interface IPlanTaskService extends IServicePlus<PlanTask, PlanTaskVo> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Map<Integer, List<PlanTaskVo>> queryPlanTaskByPlanId(Long planId);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentServiceImpl.java

@@ -86,8 +86,9 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
         lqw.eq(bo.getStatus() != null, Incident::getStatus, bo.getStatus());
         lqw.eq(bo.getMadinDept() != null, Incident::getMadinDept, bo.getMadinDept());
         lqw.eq(StringUtils.isNotBlank(bo.getAssistDept()), Incident::getAssistDept, bo.getAssistDept());
-        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
-            Incident::getCreateTime, Timestamp.valueOf(Convert.toStr(params.get("beginTime"))+ " 00:00:00"), Timestamp.valueOf(Convert.toStr(params.get("endTime")) + " 23:59:59"));
+        if (params.get("beginTime") != null && params.get("endTime") != null) {
+            lqw.between(Incident::getCreateTime, Timestamp.valueOf(Convert.toStr(params.get("beginTime"))+ " 00:00:00"), Timestamp.valueOf(Convert.toStr(params.get("endTime")) + " 23:59:59"));
+        }
         return lqw;
     }
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/PlanTaskServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.zhdd.service.IPlanTaskService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 预案任务管理Service业务层处理
@@ -67,6 +68,15 @@ public class PlanTaskServiceImpl extends ServicePlusImpl<PlanTaskMapper, PlanTas
         return updateById(update);
     }
 
+    @Override
+    public Map<Integer, List<PlanTaskVo>> queryPlanTaskByPlanId(Long planId) {
+        PlanTaskBo planTaskBo = new PlanTaskBo();
+        planTaskBo.setPlanId(planId);
+        List<PlanTaskVo> list = queryList(planTaskBo);
+        Map<Integer, List<PlanTaskVo>> collect = list.stream().collect(Collectors.groupingBy(PlanTaskVo::getLevel));
+        return collect;
+    }
+
     /**
      * 保存前的数据校验
      *