任务

pcbms/src/main/java/com/hssx/pcbms/constant/Constant.java

@@ -25,6 +25,7 @@ public class Constant {
     public static final String ALREADY_ACCEPT= "已接受";
     public static final String TASK_ACCEPTED= "已接受任务";
     public static final String ALREADY_DELAY= "已逾期";
+    public static final String ALREADY_INVALID= "已失效";
     public static final String TASK_COMPLETED= "已完成";
     public static final String TASK_NO_PASS= "未通过";
     public static final String TASK_PULISH= "发布任务";

pcbms/src/main/java/com/hssx/pcbms/controller/TaskController.java

@@ -93,6 +93,17 @@ public class TaskController {
         HttpRespMsg msg = taskService.detail(taskVO);
         return msg;
     }
+    /**
+     * 任务删除
+     * 参数：id:任务id
+     */
+    @ApiOperation(value = "任务详情", notes = "任务详情方法")
+    @RequestMapping("/del")
+    @ResponseBody
+    public HttpRespMsg del(Task task) {
+        HttpRespMsg msg = taskService.del(task);
+        return msg;
+    }
 
     /**
      * 任务失效检测定时任务
@@ -107,9 +118,5 @@ public class TaskController {
         HttpRespMsg msg = taskService.taskInvalidChecking();
         return msg;
     }
-
-
-
-
 }
 

pcbms/src/main/java/com/hssx/pcbms/service/TaskService.java

@@ -25,4 +25,6 @@ public interface TaskService extends IService<Task> {
     HttpRespMsg acceptTask(Task task);
 
     HttpRespMsg taskInvalidChecking();
+
+    HttpRespMsg del(Task task);
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/TaskServiceImpl.java

@@ -188,25 +188,38 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
     @Override
     public HttpRespMsg taskInvalidChecking() {
-        List<Task> taskList = taskMapper.selectList(new QueryWrapper<Task>().ne("state", 7));
+        List<Task> taskList = taskMapper.selectList(new QueryWrapper<Task>().ne("state", 7).ne("state", 8));
         LocalDateTime now = LocalDateTime.now();
         String format = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
         for (Task task : taskList) {
             if(task.getState()==6){
-//                if(){
-//
-//                }
+                if(format.compareTo(task.getDelayTime())>=0){
+                    task.setState(7);
+                    TaskDynamic taskDynamic = new TaskDynamic();
+                    taskDynamic.setTaskState(7);//已失效
+                    taskDynamic.setStateContent(Constant.ALREADY_INVALID);
+                    taskDynamic.setContent("["+task.getName()+"] "+Constant.ALREADY_INVALID);
+                    taskDynamicMapper.insert(taskDynamic);
+                }
             }else{
-
+                if(format.compareTo(task.getPlanTime())>=0){
+                    task.setState(7);
+                    TaskDynamic taskDynamic = new TaskDynamic();
+                    taskDynamic.setTaskState(7);//已失效
+                    taskDynamic.setStateContent(Constant.ALREADY_INVALID);
+                    taskDynamic.setContent("["+task.getName()+"] "+Constant.ALREADY_INVALID);
+                    taskDynamicMapper.insert(taskDynamic);
+                }
             }
-            
         }
         return null;
     }
 
-    public static void main(String[] args) {
-        LocalDateTime now = LocalDateTime.now();
-        String format = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
-        System.out.println(format);
+    @Override
+    public HttpRespMsg del(Task task) {
+        HttpRespMsg msg = new HttpRespMsg();
+        task.setState(8);//软删除
+        taskMapper.updateById(task);
+        return msg;
     }
 }

pcbms/src/main/resources/mapper/TaskMapper.xml

@@ -65,6 +65,7 @@
         left join user ru
         on t.recipient_id = ru.id
         <where>
+            t.state !=8
             <if test="taskVO.keyName != null and taskVO.keyName != ''">
                 and name like concat('%',#{taskVO.keyName},'%')
             </if>
@@ -100,6 +101,7 @@
             <foreach collection="list" separator="," close=")" item="item" open="t.id in (" index="index">
                 #{item}
             </foreach>
+            and t.state !=8
             <if test="taskVO.keyName != null and taskVO.keyName != ''">
                 and name like concat('%',#{taskVO.keyName},'%')
             </if>