任务

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

@@ -10,10 +10,16 @@ public class Constant {
     public static final String HANDLE_CONTENT = "将状态 oldState 改为 newState ";//处理资产类容前缀
     public static final String APP_ID = "";//appid
     public static final String SCORING_DEADLINE_CODE = "scoringDeadline";//打分日期截止
-    public static final String GOODS_MATAIN_CONTENT = "资产: name,num 需要维护。";
-    public static final String SCORING_NEWS = "上月打分截止日期快到了，请尽快为未打分的成员打分。";
+    public static final String GOODS_MATAIN_CONTENT = "资产: name,num 需要维护";
+    public static final String SCORING_NEWS = "上月打分截止日期快到了，请尽快为未打分的成员打分";
     public static final String UPDATE_SCORE = "修改打分";
     public static final String DELETE_SCORE = "删除打分";
     public static final String ADD_SCORE = "打分";
+    public static final String EXAMINE_PASS= "审核通过，任务已完成";
+    public static final String EXAMINE_NO_PASS= "审核未通过";
+    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= "待审核";
 
 }

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

@@ -40,7 +40,7 @@ public class TaskController {
      * 参数：
      * publishId :当前发布任务的人的id
      * name ：名称，tagId：标签id,code：模具型号，planTime:计划时间如：2019-10-10
-     * ，workLoad：工作量如:10（单位：天），recipientId：接受人id，payer：付款方，
+     * ，workLoad：工作量如:10（单位：天），recipientId：接受人id，payer：付款方，content:任务内容
      * payee：收款方,状态0-待派发 1-已派发 2-已完成 3-待审核 4-未通过 5-已延期（创建默认不传该字段）
      * delayTime 延长日期（创建默认不传该字段，延期处理时传该字段）
      * 修改：，id: 任务id (以上其他字段不修改不传)
@@ -67,6 +67,21 @@ public class TaskController {
         return msg;
     }
 
+    /**
+     * 任务详情
+     * 参数：pageNum:当前页，pageSize：每页多少条，uid: 当前人id
+     *  keyName:关键字，tag_id 标签id,state 状态，startTime 开始时间，endTime 结束时间
+     * type:0-我的任务 1-我发布的
+     */
+    @ApiOperation(value = "任务详情", notes = "任务详情方法")
+    @RequestMapping("/detail")
+    @ResponseBody
+    public HttpRespMsg detail(TaskVO taskVO) {
+        HttpRespMsg msg = taskService.detail(taskVO);
+        return msg;
+    }
+
+
 
 
 

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

@@ -0,0 +1,21 @@
+package com.hssx.pcbms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+@RestController
+@RequestMapping("/task-dynamic")
+public class TaskDynamicController {
+
+}
+

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

@@ -0,0 +1,51 @@
+package com.hssx.pcbms.controller;
+
+
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+@Controller
+@RequestMapping("/taskexamine")
+public class TaskExamineController {
+
+    @Autowired
+    private TaskExamineService taskExamineService;
+
+    /**
+     * 审核结果的发布
+     * 发布时参数：
+     * publisherId:发布审核结果的人
+     * publishContent:的内容
+     * taskId:任务id
+     * 回复时的参数：
+     * responderId:回复者的id
+     * isPass:是否通过1-不通过，2-通过
+     * score:评分（只有isPass=1时才传该参数）
+     */
+    @ApiOperation(value = "审核结果的发布/修改", notes = "审核结果的发布/修改方法")
+    @RequestMapping("/addOrUpdate")
+    @ResponseBody
+    public HttpRespMsg addOrUpdate(TaskExamine taskExamine,@RequestParam(required = false) Integer type) {
+        HttpRespMsg msg = taskExamineService.addOrUpdate(taskExamine,type);
+        return msg;
+    }
+}
+

pcbms/src/main/java/com/hssx/pcbms/entity/Task.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-11-11
+ * @since 2019-11-12
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -99,7 +99,7 @@ public class Task extends Model<Task> {
     private String delayTime;
 
     /**
-     * 状态0-待派发 1-已派发 2-已接受 3-待审核 4-未通过
+     * 状态0-待派发 1-已派发 2-已接受 3-待审核 4-未通过 5-已完成
      */
     @TableField("state")
     private Integer state;
@@ -110,6 +110,12 @@ public class Task extends Model<Task> {
     @TableField("publish_id")
     private Integer publishId;
 
+    /**
+     * 任务内容
+     */
+    @TableField("content")
+    private String content;
+
 
     @Override
     protected Serializable pkVal() {

pcbms/src/main/java/com/hssx/pcbms/entity/TaskDynamic.java

@@ -0,0 +1,76 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaskDynamic extends Model<TaskDynamic> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 任务动态表主键
+     */
+    //AUTO 数据库ID自增
+    //INPUT 用户输入ID
+    //ID_WORKER 全局唯一ID，Long类型的主键
+    //ID_WORKER_STR 字符串全局唯一ID
+    //UUID 全局唯一ID，UUID类型的主键
+    //NONE 该类型为未设置主键类型
+    @TableId(value = "id",type = IdType.ID_WORKER_STR )
+    private String id;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private String taskId;
+
+    /**
+     * 时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 状态描述
+     */
+    @TableField("state_content")
+    private String stateContent;
+
+    /**
+     * 任务状态
+     */
+    @TableField("task_state")
+    private Integer taskState;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

pcbms/src/main/java/com/hssx/pcbms/entity/TaskExamine.java

@@ -0,0 +1,106 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaskExamine extends Model<TaskExamine> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 任务审核表主键
+     */
+    @TableId(value = "id",type = IdType.ID_WORKER_STR )
+    private String id;
+
+    /**
+     * 发布人id
+     */
+    @TableField("publisher_id")
+    private Integer publisherId;
+
+    /**
+     * 发布者名字
+     */
+    @TableField("publisher")
+    private String publisher;
+
+    /**
+     * 发布内容
+     */
+    @TableField("publish_content")
+    private String publishContent;
+
+    /**
+     * 回复者
+     */
+    @TableField("responder")
+    private String responder;
+
+    /**
+     * 回复者id
+     */
+    @TableField("responder_id")
+    private Integer responderId;
+
+    /**
+     * 回复内容
+     */
+    @TableField("respond_content")
+    private String respondContent;
+
+    /**
+     * 发布日期
+     */
+    @TableField("publish_date")
+    private LocalDateTime publishDate;
+
+    /**
+     * 回复日期
+     */
+    @TableField("respond_date")
+    private LocalDateTime respondDate;
+
+    /**
+     * 是否通过0-不通过，1-通过
+     */
+    @TableField("is_pass")
+    private Integer isPass;
+
+    /**
+     * 评分
+     */
+    @TableField("score")
+    private Double score;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private String taskId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/TaskDynamicMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.TaskDynamic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+public interface TaskDynamicMapper extends BaseMapper<TaskDynamic> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/TaskExamineMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.TaskExamine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+public interface TaskExamineMapper extends BaseMapper<TaskExamine> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/TaskMapper.java

@@ -21,4 +21,6 @@ public interface TaskMapper extends BaseMapper<Task> {
     List<TaskDTO> selectListByCondition(@Param("taskVO") TaskVO taskVO);
 
     List<TaskDTO> selectListByTaskIds(@Param("list")List<String> taskIds);
+
+    TaskDTO getDetailById(@Param("taskVO")TaskVO taskVO);
 }

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

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.TaskDynamic;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+public interface TaskDynamicService extends IService<TaskDynamic> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.TaskExamine;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.util.HttpRespMsg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+public interface TaskExamineService extends IService<TaskExamine> {
+
+    HttpRespMsg addOrUpdate(TaskExamine taskExamine,Integer type);
+}

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

@@ -19,4 +19,6 @@ public interface TaskService extends IService<Task> {
     HttpRespMsg addOrUpdate(Task task,String participantsIdes);
 
     HttpRespMsg getListByCondition(TaskVO taskVO, PageUtil page);
+
+    HttpRespMsg detail(TaskVO taskVO);
 }

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.TaskDynamic;
+import com.hssx.pcbms.mapper.TaskDynamicMapper;
+import com.hssx.pcbms.service.TaskDynamicService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+@Service
+public class TaskDynamicServiceImpl extends ServiceImpl<TaskDynamicMapper, TaskDynamic> implements TaskDynamicService {
+
+}

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

@@ -0,0 +1,83 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.constant.Constant;
+import com.hssx.pcbms.entity.Task;
+import com.hssx.pcbms.entity.TaskDynamic;
+import com.hssx.pcbms.entity.TaskExamine;
+import com.hssx.pcbms.mapper.TaskDynamicMapper;
+import com.hssx.pcbms.mapper.TaskExamineMapper;
+import com.hssx.pcbms.mapper.TaskMapper;
+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 org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-12
+ */
+@Service
+public class TaskExamineServiceImpl extends ServiceImpl<TaskExamineMapper, TaskExamine> implements TaskExamineService {
+    @Resource
+    private TaskExamineMapper taskExamineMapper;
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    private TaskDynamicMapper taskDynamicMapper;
+    @Resource
+    private TaskMapper taskMapper;
+
+    @Override
+    public HttpRespMsg addOrUpdate(TaskExamine taskExamine, Integer type) {
+        HttpRespMsg msg = new HttpRespMsg();
+        TaskDynamic dynamic = new TaskDynamic();
+        dynamic.setTaskId(taskExamine.getTaskId());
+        Task task = new Task();
+        if (taskExamine.getId() == null) {
+            //添加操作
+            taskExamine.setPublisher(userMapper.selectById(taskExamine.getPublisherId()).getName());
+            taskExamineMapper.insert(taskExamine);
+            //添加动态
+            dynamic.setTaskState(3);
+            dynamic.setContent(taskExamine.getPublisher()+Constant.EXAMINE_SUBMIT);
+            dynamic.setStateContent(Constant.TASK_CHECK_PENDING);
+            taskDynamicMapper.insert(dynamic);
+            task.setId(taskExamine.getTaskId());
+            task.setState(3);
+            taskMapper.updateById(task);
+        } else {
+            //回复操作
+            taskExamine.setResponder(userMapper.selectById(taskExamine.getResponderId()).getName());
+            taskExamine.setRespondDate(LocalDateTime.now());
+            taskExamineMapper.updateById(taskExamine);
+            TaskExamine newTaskExamine = taskExamineMapper.selectById(taskExamine.getId());
+            task.setId(newTaskExamine.getTaskId());
+            if (taskExamine.getIsPass() == 2) {
+                //添加通过任务处理动态
+                dynamic.setTaskState(5);
+                dynamic.setContent(newTaskExamine.getResponder()+Constant.EXAMINE_PASS);
+                dynamic.setStateContent(Constant.TASK_COMPLETED);
+                taskDynamicMapper.insert(dynamic);
+                task.setState(5);
+                taskMapper.updateById(task);
+            } else if (taskExamine.getIsPass() == 1) {
+                //添加不通过任务处理动态
+                dynamic.setTaskState(4);
+                dynamic.setContent(newTaskExamine.getResponder()+Constant.EXAMINE_NO_PASS);
+                dynamic.setStateContent(Constant.TASK_NO_PASS);
+                taskDynamicMapper.insert(dynamic);
+                task.setState(4);
+                taskMapper.updateById(task);
+            }
+        }
+        return msg;
+    }
+}

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

@@ -99,4 +99,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg detail(TaskVO taskVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        TaskDTO dto = taskMapper.getDetailById(taskVO);
+        msg.data = dto;
+        return msg;
+    }
 }

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("task_participants");
+        strategy.setInclude("task_dynamic");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.pcbms.mapper.TaskDynamicMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.TaskDynamic">
+        <id column="id" property="id" />
+        <result column="task_id" property="taskId" />
+        <result column="indate" property="indate" />
+        <result column="content" property="content" />
+        <result column="state_content" property="stateContent" />
+        <result column="task_state" property="taskState" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, task_id, indate, content, state_content, task_state
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.pcbms.mapper.TaskExamineMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.TaskExamine">
+        <id column="id" property="id" />
+        <result column="publisher_id" property="publisherId" />
+        <result column="publisher" property="publisher" />
+        <result column="publish_content" property="publishContent" />
+        <result column="responder" property="responder" />
+        <result column="responder_id" property="responderId" />
+        <result column="respond_content" property="respondContent" />
+        <result column="publish_date" property="publishDate" />
+        <result column="respond_date" property="respondDate" />
+        <result column="is_pass" property="isPass" />
+        <result column="score" property="score" />
+        <result column="task_id" property="taskId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, publisher_id, publisher, publish_content, responder, responder_id, respond_content, publish_date, respond_date, is_pass, score, task_id
+    </sql>
+
+</mapper>

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

@@ -17,6 +17,7 @@
         <result column="delay_time" property="delayTime" />
         <result column="state" property="state" />
         <result column="publish_id" property="publishId" />
+        <result column="content" property="content" />
     </resultMap>
     <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.TaskDTO">
         <id column="id" property="id" />
@@ -35,6 +36,7 @@
         <result column="publishName" property="publishName" />
         <result column="tag_name" property="tagName" />
         <result column="recipient" property="recipient" />
+        <result column="content" property="content" />
         <collection property="participantsVOS" select="selectPaticaterByTaskId" column="{taskId=id,}"
                     ofType="com.hssx.pcbms.entity.vo.TaskParticipantsVO"/>
     </resultMap>
@@ -48,21 +50,21 @@
         select
         t.id, t.name, t.code, t.plan_time, t.work_load, t.recipient_id,
         t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id
-        u.name publishName,tt.name tag_name,ru.name recipient
-          from
-            task t
-          left join user u
-          on t.publish_id = u.id
-          left join task_tags tt
-          on tt.id = t.tag_id
-          left join user ru
-          on t.recipient_id = ru.id
+        u.name publishName,tt.name tag_name,ru.name recipient,t.content
+        from
+        task t
+        left join user u
+        on t.publish_id = u.id
+        left join task_tags tt
+        on tt.id = t.tag_id
+        left join user ru
+        on t.recipient_id = ru.id
         <where>
             <if test="taskVO.keyName != null and taskVO.keyName != ''">
                 and name like concat('%',#{taskVO.keyName},'%')
             </if>
             <if test="taskVO.startTime != null and taskVO.startTime != ''and taskVO.endTime != null and taskVO.endTime != ''">
-               and plan_time between #{taskVO.startTime} and #{taskVO.endTime}
+                and plan_time between #{taskVO.startTime} and #{taskVO.endTime}
             </if>
             <if test="taskVO.uid != null">
                 and publish_id =#{taskVO.uid}
@@ -114,4 +116,23 @@
           on tp.user_id = u.id
           where tp.task_id = #{id}
     </select>
+    
+    <select id="getDetailById" resultMap="BaseResultMapVO">
+        select
+        t.id, t.name, t.code, t.plan_time, t.work_load, t.recipient_id,
+        t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id
+        u.name publishName,tt.name tag_name,ru.name recipient,t.content
+        from
+        task t
+        left join user u
+        on t.publish_id = u.id
+        left join task_tags tt
+        on tt.id = t.tag_id
+        left join user ru
+        on t.recipient_id = ru.id
+        <where>
+            t.id = #{taskVO.id}
+        </where>
+    </select>
+
 </mapper>