任务添加提交

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/EmergencyTaskContent.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.dao.entity;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -43,10 +44,6 @@ public class EmergencyTaskContent extends BasicEntity {
     @Column(name = "is_must")
     private boolean isMust;
 
-    //所属角色
-    @Transient
-    private List<String> roleCodeList;
-
     //所属流程步骤编号
     @Column(name = "button_json")
     private String buttonJson;
@@ -58,4 +55,8 @@ public class EmergencyTaskContent extends BasicEntity {
     //关联角色名称
     @Column(name = "obligation_name")
     private String obligationName;
+
+    //所属角色
+    @Transient
+    private ArrayList<String> roleCodeList;
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EmergencyTaskController.java

@@ -2,15 +2,19 @@ package com.yeejoin.amos.fas.business.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskRoleMapper;
 import com.yeejoin.amos.fas.business.feign.JcsFeign;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
 import com.yeejoin.amos.fas.business.vo.EmergencyRelationVo;
 import com.yeejoin.amos.fas.common.enums.PlanTypeEnum;
+import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
+import com.yeejoin.amos.fas.core.util.ResponseModel;
 import com.yeejoin.amos.fas.dao.entity.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +52,9 @@ public class EmergencyTaskController extends BaseController{
     @Autowired
     private EmergencyTaskRoleMapper emergencyTaskRoleMapper;
 
+    @Autowired
+    private EmergencyTaskMapper emergencyTaskMapper;
+
     @ApiOperation(httpMethod = "GET",value = "岗位人员树", notes = "岗位人员树")
     @RequestMapping(value = "/tree", method = RequestMethod.GET)
     public CommonResponse tree(){
@@ -156,6 +163,14 @@ public class EmergencyTaskController extends BaseController{
         return CommonResponseUtil.success();
     }
 
+    @Permission
+    @ApiOperation(value = "根据ID删除数据", notes = "根据ID删除数据")
+    @DeleteMapping(value = "/deleteById", produces = "application/json;charset=UTF-8")
+    public ResponseModel deleteById(@RequestParam(value = "id") Long id) {
+        emergencyTaskMapper.deleteTask(id);
+        return CommonResponseUtil2.success();
+    }
+
     @ApiOperation(httpMethod = "POST",value = "编辑树人员节点", notes = "编辑树人员节点")
     @PostMapping(value = "/editPerson", produces = "application/json;charset=UTF-8")
     public CommonResponse editPerson(@RequestBody EmergencyRelationVo vo){

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EmergencyTaskMapper.java

@@ -16,6 +16,10 @@ public interface EmergencyTaskMapper extends BaseMapper {
 
     void deleteTreeNode(Long obligationId , Long personId);
 
+
+    void deleteTask(Long id);
+
+
     void save(EmergencyRelation emergencyRelation);
 
     void saveTaskConfig(EmergencyTaskContent emergencyTaskContent);

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_emergency_task.xml

@@ -89,6 +89,17 @@
         </where>
     </select>
 
+    <delete id="deleteTask">
+
+        delete  from   c_emergency_task_content cer
+
+        <where>
+            <if test="id != null  ">
+                cer.id = #{id}
+            </if>
+        </where>
+    </delete>
+
     <delete id="deleteTreeNode">
 
        delete  from   c_emergency_relation cer