459242451@qq.com 3 rokov pred
rodič
commit
92c4036c81

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

@@ -26,11 +26,13 @@ import com.ruoyi.zhdd.domain.IncidentProcess;
 import com.ruoyi.zhdd.domain.IncidentTaskCommand;
 import com.ruoyi.zhdd.domain.IncidentTaskPerson;
 import com.ruoyi.zhdd.domain.Plan;
+import com.ruoyi.zhdd.domain.PlanFile;
 import com.ruoyi.zhdd.domain.bo.IncidentBo;
 import com.ruoyi.zhdd.domain.bo.IncidentTasksBo;
 import com.ruoyi.zhdd.domain.vo.IncidentTaskCommandVo;
 import com.ruoyi.zhdd.domain.vo.IncidentTaskVo;
 import com.ruoyi.zhdd.domain.vo.IncidentVo;
+import com.ruoyi.zhdd.domain.vo.PlanFileVo;
 import com.ruoyi.zhdd.domain.vo.PlanVo;
 import com.ruoyi.zhdd.feign.FeignNoticeInfoService;
 import com.ruoyi.zhdd.service.IIncidentProcessService;
@@ -38,6 +40,7 @@ import com.ruoyi.zhdd.service.IIncidentService;
 import com.ruoyi.zhdd.service.IIncidentTaskCommandService;
 import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
 import com.ruoyi.zhdd.service.IIncidentTaskService;
+import com.ruoyi.zhdd.service.IPlanFileService;
 import com.ruoyi.zhdd.service.IPlanService;
 import com.ruoyi.zhdd.service.IPlanTaskService;
 import io.swagger.annotations.Api;
@@ -91,6 +94,8 @@ public class IncidentController extends BaseController {
 
     private final IPlanService planService;
 
+    private final IPlanFileService planFileService;
+
     private final ISysDictDataService sysDictDataService;
 
     private final FeignNoticeInfoService feignNoticeInfoService;
@@ -138,6 +143,13 @@ public class IncidentController extends BaseController {
         } else {
             map.put("baseTask", null);
         }
+        // 查询预案附件
+        List<PlanFileVo> planFileVos = planFileService.listVo(Wrappers.<PlanFile>lambdaQuery().eq(PlanFile::getPlanId, voOne.get(0).getId()));
+        String fileUrl = "";
+        if (planFileVos != null && planFileVos.size() > 0) {
+            fileUrl = planFileVos.get(0).getFileUrl();
+        }
+        map.put("planFile", fileUrl);
         // 查询处置方案
         map.put("task", incidentTaskService.listTaskInfo(id));
         List<IncidentProcess> list = iIncidentProcessService.list(Wrappers.<IncidentProcess>lambdaQuery()