Merge branch 'wangdingyi' into 'dev'

查询任务列表返回结果修改

See merge request !11

quality-review/src/main/java/com/ruoyi/web/response/ReviewSceneChangeTaskResponse.java

+package com.ruoyi.web.response;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ReviewSceneChangeTaskResponse {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 任务编号
+     */
+    private String taskNo;
+
+    /**
+     * 章节
+     */
+    private String chapter;
+
+    /**
+     * 审查标准id
+     */
+    private Long standardId;
+
+    /**
+     * 审查标准
+     */
+    private String standard;
+
+    /**
+     * 审查要点id
+     */
+    private Long keypointId;
+
+    /**
+     * 审查要点
+     */
+    private String keypoint;
+
+    /**
+     * 审查细则id
+     */
+    private Long detailsId;
+
+    /**
+     * 审查细则
+     */
+    private String details;
+
+    /**
+     * 操作（ADD DELETE UPDATE）
+     */
+    private String operation;
+
+    /**
+     * 当 operation 为 ADD 时该字段为空
+     */
+    private String oldText;
+
+    /**
+     * 当 operation 为 DELETE 时该字段为空
+     */
+    private String newText;
+
+    /**
+     * 任务发起人姓名
+     */
+    private String taskInitiator;
+
+    /**
+     * 任务发起人部门
+     */
+    private String taskInitiatorDept;
+
+    /**
+     * 任务发起人Id
+     */
+    private Long taskInitiatorId;
+
+    /**
+     * 任务状态（PENDING、FINISH、CLOSE）
+     */
+    private String taskStatus;
+
+    /**
+     * 任务结果（PASS、REJECT）
+     */
+    private String taskResult;
+
+    /**
+     * 任务开始时间
+     */
+    private Date taskBeginTime;
+
+    /**
+     * 任务结束时间
+     */
+    private Date taskEndTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 审查场景id
+     * 若为修改、删除任务时，此id在创建任务时赋值
+     * 若为新增任务时，此id在审批通过并保存新场景后赋值
+     */
+    private Long reviewSceneId;
+
+    /**
+     * 本人审核意见（PASS、REJECT）
+     */
+    private String decision;
+}

quality-review/src/main/resources/mapper/ReviewSceneChangeTaskMapper.xml

@@ -22,6 +22,25 @@
             <result property="taskEndTime" column="task_end_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
+    <resultMap id="ResponseResultMap" type="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="taskNo" column="no" jdbcType="VARCHAR"/>
+        <result property="chapter" column="chapter" jdbcType="VARCHAR"/>
+        <result property="standard" column="standard" jdbcType="VARCHAR"/>
+        <result property="keypoint" column="keypoint" jdbcType="VARCHAR"/>
+        <result property="details" column="details" jdbcType="VARCHAR"/>
+        <result property="operation" column="operation" jdbcType="VARCHAR"/>
+        <result property="oldText" column="old_text" jdbcType="VARCHAR"/>
+        <result property="newText" column="new_text" jdbcType="VARCHAR"/>
+        <result property="taskInitiator" column="task_initiator" jdbcType="VARCHAR"/>
+        <result property="taskInitiatorDept" column="task_initiator_dept" jdbcType="VARCHAR"/>
+        <result property="taskStatus" column="task_status" jdbcType="VARCHAR"/>
+        <result property="taskResult" column="task_result" jdbcType="VARCHAR"/>
+        <result property="taskBeginTime" column="task_begin_time" jdbcType="TIMESTAMP"/>
+        <result property="taskEndTime" column="task_end_time" jdbcType="TIMESTAMP"/>
+        <result property="decision" column="decision" jdbcType="VARCHAR"/>
+    </resultMap>
+
     <select id="findLastChangeByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
         SELECT * FROM t_review_scene_change_task WHERE id IN
            (
@@ -29,14 +48,14 @@
            )
     </select>
 
-    <select id="findPendingListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
-        SELECT sct.* FROM t_review_scene_change_task sct
+    <select id="findPendingListByUserId" resultType="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
+        SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct
         LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id
         WHERE sctu.user_id = #{userId} and sctu.decision IS NULL
     </select>
 
-    <select id="findFinishListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
-        SELECT sct.* FROM t_review_scene_change_task sct
+    <select id="findFinishListByUserId" resultType="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
+        SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct
         LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id
         WHERE sctu.user_id = #{userId} and sctu.decision IS NOT NULL
     </select>