任务

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

@@ -20,6 +20,6 @@ public class Constant {
     public static final String EXAMINE_SUBMIT= "已提交任务";
     public static final String TASK_COMPLETED= "已完成";
     public static final String TASK_NO_PASS= "未通过";
-    public static final String TASK_CHECK_PENDING= "待审核";
+    public static final String TASK_PULISH= "发布任务";
 
 }

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

@@ -38,7 +38,7 @@ public class TaskController {
     /**
      * 任务录入/修改
      * 参数：
-     * publishId :当前发布任务的人的id
+     * publishId :当前发布任务的人的id,participantsIdes 参与人ids 如：“1,2,3”
      * name ：名称，tagId：标签id,code：模具型号，planTime:计划时间如：2019-10-10
      * ，workLoad：工作量如:10（单位：天），recipientId：接受人id，payer：付款方，content:任务内容
      * payee：收款方,状态0-待派发 1-已派发 2-已完成 3-待审核 4-未通过 5-已延期（创建默认不传该字段）
@@ -56,7 +56,7 @@ public class TaskController {
     /**
      * 任务列表
      * 参数：pageNum:当前页，pageSize：每页多少条，uid: 当前人id
-     *  keyName:关键字，tag_id 标签id,state 状态，startTime 开始时间，endTime 结束时间
+     *  keyName:关键字，tagId 标签id,state 状态，startTime 开始时间，endTime 结束时间
      * type:0-我的任务 1-我发布的
      */
     @ApiOperation(value = "任务列表", notes = "任务列表方法")
@@ -69,9 +69,7 @@ public class TaskController {
 
     /**
      * 任务详情
-     * 参数：pageNum:当前页，pageSize：每页多少条，uid: 当前人id
-     *  keyName:关键字，tag_id 标签id,state 状态，startTime 开始时间，endTime 结束时间
-     * type:0-我的任务 1-我发布的
+     * 参数：pageNum:当前页，pageSize：每页多少条，id: 任务id
      */
     @ApiOperation(value = "任务详情", notes = "任务详情方法")
     @RequestMapping("/detail")

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

@@ -5,6 +5,7 @@ import com.hssx.pcbms.entity.Task;
 import com.hssx.pcbms.entity.TaskExamine;
 import com.hssx.pcbms.service.TaskExamineService;
 import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -47,5 +48,19 @@ public class TaskExamineController {
         HttpRespMsg msg = taskExamineService.addOrUpdate(taskExamine,type);
         return msg;
     }
+
+    /**
+     * 审核结果列表
+     * 参数：
+     * taskId:任务id,pageNum:当前页，pageSize：每页多少条
+     * @return
+     */
+    @ApiOperation(value = "审核结果列表", notes = "审核结果列表方法")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(PageUtil page, String taskId) {
+        HttpRespMsg msg = taskExamineService.getList(page,taskId);
+        return msg;
+    }
 }
 

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

@@ -3,6 +3,7 @@ package com.hssx.pcbms.service;
 import com.hssx.pcbms.entity.TaskExamine;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.PageUtil;
 
 /**
  * <p>
@@ -15,4 +16,6 @@ import com.hssx.pcbms.util.HttpRespMsg;
 public interface TaskExamineService extends IService<TaskExamine> {
 
     HttpRespMsg addOrUpdate(TaskExamine taskExamine,Integer type);
+
+    HttpRespMsg getList(PageUtil page, String taskId);
 }

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

@@ -1,5 +1,8 @@
 package com.hssx.pcbms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.pcbms.constant.Constant;
 import com.hssx.pcbms.entity.Task;
 import com.hssx.pcbms.entity.TaskDynamic;
@@ -11,10 +14,12 @@ import com.hssx.pcbms.mapper.UserMapper;
 import com.hssx.pcbms.service.TaskExamineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.PageUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -48,7 +53,7 @@ public class TaskExamineServiceImpl extends ServiceImpl<TaskExamineMapper, TaskE
             //添加动态
             dynamic.setTaskState(3);
             dynamic.setContent(taskExamine.getPublisher()+Constant.EXAMINE_SUBMIT);
-            dynamic.setStateContent(Constant.TASK_CHECK_PENDING);
+            dynamic.setStateContent(Constant.TASK_PULISH);
             taskDynamicMapper.insert(dynamic);
             task.setId(taskExamine.getTaskId());
             task.setState(3);
@@ -80,4 +85,14 @@ public class TaskExamineServiceImpl extends ServiceImpl<TaskExamineMapper, TaskE
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getList(PageUtil page, String taskId) {
+        HttpRespMsg msg = new HttpRespMsg();
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        List<TaskExamine> list = taskExamineMapper.selectList(new QueryWrapper<TaskExamine>().eq("task_id", taskId));
+        PageInfo<TaskExamine> pageInfo = new PageInfo<>(list);
+        msg.data = pageInfo;
+        return msg;
+    }
 }

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

@@ -3,18 +3,21 @@ package com.hssx.pcbms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hssx.pcbms.constant.Constant;
 import com.hssx.pcbms.entity.Task;
+import com.hssx.pcbms.entity.TaskDynamic;
 import com.hssx.pcbms.entity.TaskParticipants;
 import com.hssx.pcbms.entity.vo.TaskDTO;
 import com.hssx.pcbms.entity.vo.TaskVO;
+import com.hssx.pcbms.mapper.TaskDynamicMapper;
 import com.hssx.pcbms.mapper.TaskMapper;
+import com.hssx.pcbms.mapper.UserMapper;
 import com.hssx.pcbms.service.TaskParticipantsService;
 import com.hssx.pcbms.service.TaskService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
 import com.hssx.pcbms.util.ListUtil;
 import com.hssx.pcbms.util.PageUtil;
-import org.apache.commons.collections4.collection.CompositeCollection;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -37,6 +40,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     private TaskMapper taskMapper;
     @Resource
     private TaskParticipantsService taskParticipantsService;
+    @Resource
+    private TaskDynamicMapper taskDynamicMapper;
+    @Resource
+    private UserMapper userMapper;
 
     @Override
     public HttpRespMsg addOrUpdate(Task task,String participantsIdes) {
@@ -44,6 +51,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         List<TaskParticipants> taskParticipants = new ArrayList<>();
         if(null == task.getId()){
             taskMapper.insert(task);
+            TaskDynamic taskDynamic = new TaskDynamic();
+            taskDynamic.setTaskId(task.getId());
+            taskDynamic.setTaskState(0);//待派发
+            taskDynamic.setStateContent(userMapper.selectById(task.getPublishId()).getName()+Constant.TASK_PULISH);
+            taskDynamicMapper.insert(taskDynamic);
             if(participantsIdes.length()>0 && participantsIdes != ""){
                 List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(participantsIdes);
                 for (Integer id : ids) {
@@ -55,7 +67,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 taskParticipantsService.saveBatch(taskParticipants);
             }
         }else{
+//            if(task.getDelayTime()){
+//
+//            }
             taskMapper.updateById(task);
+
             if(participantsIdes.length()>0 && participantsIdes != ""){
                 taskParticipantsService.remove(new QueryWrapper<TaskParticipants>().eq("task_id",task.getId()));
                 List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(participantsIdes);

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

@@ -69,6 +69,9 @@
             <if test="taskVO.uid != null">
                 and publish_id =#{taskVO.uid}
             </if>
+            <if test="taskVO.tagId != null and taskVO.tagId != ''">
+                and t.tag_id = #{taskVO.tagId}
+            </if>
         </where>
         order by t.id desc
     </select>
@@ -98,6 +101,9 @@
             <if test="taskVO.uid != null">
                 and publish_id =#{taskVO.uid}
             </if>
+            <if test="taskVO.tagId != null and taskVO.tagId != ''">
+                and t.tag_id = #{taskVO.tagId}
+            </if>
         </where>
         order by t.id desc
     </select>