增加处置总结

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

@@ -111,6 +111,9 @@ public class IncidentController extends BaseController {
         if ("app".equals(bo.getQuerySource())) {
             bo.setStatus(3);
         }
+        if (StrUtil.isNotBlank(bo.getStatuss())) {
+            bo.setStatuss(bo.getStatuss().replace("-", ""));
+        }
         return iIncidentService.queryPageList(bo);
     }
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Incident.java

@@ -66,6 +66,8 @@ public class Incident implements Serializable {
      */
     private String conclusion;
 
+    private String conclusionDeal;
+
     private String conclusionFile;
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentBo.java

@@ -115,6 +115,7 @@ public class IncidentBo extends BaseEntity {
 
     @ApiModelProperty(value = "归档总结")
     private String conclusion;
+    private String conclusionDeal;
 
     @ApiModelProperty(value = "归档总结附件")
     private String conclusionFile;

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

@@ -115,6 +115,8 @@ public class IncidentVo {
     @ApiModelProperty(value = "归档总结")
     private String conclusion;
 
+    private String conclusionDeal;
+
     @ApiModelProperty(value = "归档总结附件")
     private String conclusionFile;
 

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

@@ -21,8 +21,6 @@ import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.zhdd.domain.Incident;
 import com.ruoyi.zhdd.domain.bo.IncidentBo;
-import com.ruoyi.zhdd.domain.bo.IncidentProcessBo;
-import com.ruoyi.zhdd.domain.vo.IncidentProcessVo;
 import com.ruoyi.zhdd.domain.vo.IncidentVo;
 import com.ruoyi.zhdd.mapper.IncidentMapper;
 import com.ruoyi.zhdd.service.IIncidentProcessService;
@@ -146,6 +144,7 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
         Incident update = BeanUtil.toBean(bo, Incident.class);
         validEntityBeforeSave(update);
         if (flag && bo.getStatus() == 3) {
+            // 第一次派发
             // 待处置状态
             if (StrUtil.isBlank(bo.getMadinDept())) {
                 throw new ServiceException("请选择主办单位！");
@@ -184,13 +183,6 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
 //            }
 //            incidentTaskService.saveAll(incidentTasks);
         } else if (flag && bo.getStatus() == 4) {
-            // 如果为归档的话，处置过程至少有一个
-            IncidentProcessBo incidentProcessBo = new IncidentProcessBo();
-            incidentProcessBo.setIncidentId(update.getId());
-            List<IncidentProcessVo> incidentProcessVos = incidentProcessService.queryList(incidentProcessBo);
-            if (incidentProcessVos.size() == 0) {
-                throw new ServiceException("至少需要一条处置过程！");
-            }
             if (StrUtil.isBlank(bo.getConclusion())) {
                 throw new ServiceException("请填写归档总结！");
             }