2/1 陈宇

RMS/src/main/java/cn/cslg/report/common/model/vo/TaskReportVO.java

@@ -20,16 +20,18 @@ import java.util.List;
  */
 @Data
 @Accessors(chain = true)
-@Schema(description="任务VO",required = true)
+@Schema(description = "任务VO", required = true)
 public class TaskReportVO extends BaseVO {
     private Integer id;
     private String createName;
     private Integer createID;
-   private Integer  reportType;
+    private Integer reportType;
     @Schema(description = "报告信息")
     private Report report;
     @Schema(description = "报告Id")
     private Integer reportId;
+    @Schema(description = "报告名称")
+    private String reportName;
     @Schema(description = "参与人Id列表")
     private List<Integer> personIds;
 
@@ -42,18 +44,18 @@ public class TaskReportVO extends BaseVO {
     @Schema(description = "任务类型 0开卷审核任务")
     private Integer type;
 
-    @Schema(description = "处理人ID",required = true)
+    @Schema(description = "处理人ID", required = true)
     private Integer handlePersonId;
 
 
-   @Schema(description = "处理人姓名",required = true)
-   private String handlePersonName;
+    @Schema(description = "处理人姓名", required = true)
+    private String handlePersonName;
 
 
- @Schema(description = "创建任务时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+    @Schema(description = "创建任务时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
     @Schema(description = "任务结束时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -1,43 +1,45 @@
 <?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="cn.cslg.report.mapper.TaskMapper">
-    <select id="queryTasks" resultType="cn.cslg.report.common.model.vo.TaskReportVO" >
-   select a.* ,b.TYPE as reportType,b.SIGN_PATENT_NO as signPatentNo from TASK a left join REPORT b on a.REPORT_ID=b.ID
-   <where>
-<if test="param.type !=null">
- and a.TYPE =#{param.type}
-</if>
-        <if test="param.taskStatuses !=null and param.taskStatuses.size>0">
-and a.TASK_STATUS in
-            <foreach collection="param.taskStatuses" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-        <if test="param.ids !=null and param.ids.size()!=0 ">
-            and a.CREATE_ID in
-            <foreach collection="param.ids" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-       <if test="param.handleIds !=null and param.handleIds.size()!=0 ">
-           and a.HANDLE_PERSON_ID in
-           <foreach collection="param.handleIds" item="item" separator="," open="(" close=")">
-               #{item}
-           </foreach>
-       </if>
-        <if test="param.taskName !=null and param.taskName !=''">
-and a.TASK_NAME  like concat('%', #{param.taskName}, '%')
+    <select id="queryTasks" resultType="cn.cslg.report.common.model.vo.TaskReportVO">
+        select a.* ,b.TYPE as reportType,b.SIGN_PATENT_NO as signPatentNo, b.NAME as reportName from TASK a left join
+        REPORT b on
+        a.REPORT_ID=b.ID
+        <where>
+            <if test="param.type !=null">
+                and a.TYPE =#{param.type}
+            </if>
+            <if test="param.taskStatuses !=null and param.taskStatuses.size>0">
+                and a.TASK_STATUS in
+                <foreach collection="param.taskStatuses" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.ids !=null and param.ids.size()!=0 ">
+                and a.CREATE_ID in
+                <foreach collection="param.ids" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.handleIds !=null and param.handleIds.size()!=0 ">
+                and a.HANDLE_PERSON_ID in
+                <foreach collection="param.handleIds" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.taskName !=null and param.taskName !=''">
+                and a.TASK_NAME like concat('%', #{param.taskName}, '%')
 
-        </if>
+            </if>
 
-        <if test="param.roleInTask !=null and param.roleInTask == 0">
-and a.CREATE_ID=#{param.loginId}
+            <if test="param.roleInTask !=null and param.roleInTask == 0">
+                and a.CREATE_ID=#{param.loginId}
 
-        </if>
-        <if test="param.roleInTask !=null and param.roleInTask == 1">
-            and a.HANDLE_PERSON_ID=#{param.loginId}
-        </if>
-   </where>
+            </if>
+            <if test="param.roleInTask !=null and param.roleInTask == 1">
+                and a.HANDLE_PERSON_ID=#{param.loginId}
+            </if>
+        </where>
         order by a.id desc
     </select>
 </mapper>

RMS/target/classes/mapper/TaskMapper.xml

@@ -1,43 +1,45 @@
 <?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="cn.cslg.report.mapper.TaskMapper">
-    <select id="queryTasks" resultType="cn.cslg.report.common.model.vo.TaskReportVO" >
-   select a.* ,b.TYPE as reportType,b.SIGN_PATENT_NO as signPatentNo from TASK a left join REPORT b on a.REPORT_ID=b.ID
-   <where>
-<if test="param.type !=null">
- and a.TYPE =#{param.type}
-</if>
-        <if test="param.taskStatuses !=null and param.taskStatuses.size>0">
-and a.TASK_STATUS in
-            <foreach collection="param.taskStatuses" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-        <if test="param.ids !=null and param.ids.size()!=0 ">
-            and a.CREATE_ID in
-            <foreach collection="param.ids" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-       <if test="param.handleIds !=null and param.handleIds.size()!=0 ">
-           and a.HANDLE_PERSON_ID in
-           <foreach collection="param.handleIds" item="item" separator="," open="(" close=")">
-               #{item}
-           </foreach>
-       </if>
-        <if test="param.taskName !=null and param.taskName !=''">
-and a.TASK_NAME  like concat('%', #{param.taskName}, '%')
+    <select id="queryTasks" resultType="cn.cslg.report.common.model.vo.TaskReportVO">
+        select a.* ,b.TYPE as reportType,b.SIGN_PATENT_NO as signPatentNo, b.NAME as reportName from TASK a left join
+        REPORT b on
+        a.REPORT_ID=b.ID
+        <where>
+            <if test="param.type !=null">
+                and a.TYPE =#{param.type}
+            </if>
+            <if test="param.taskStatuses !=null and param.taskStatuses.size>0">
+                and a.TASK_STATUS in
+                <foreach collection="param.taskStatuses" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.ids !=null and param.ids.size()!=0 ">
+                and a.CREATE_ID in
+                <foreach collection="param.ids" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.handleIds !=null and param.handleIds.size()!=0 ">
+                and a.HANDLE_PERSON_ID in
+                <foreach collection="param.handleIds" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.taskName !=null and param.taskName !=''">
+                and a.TASK_NAME like concat('%', #{param.taskName}, '%')
 
-        </if>
+            </if>
 
-        <if test="param.roleInTask !=null and param.roleInTask == 0">
-and a.CREATE_ID=#{param.loginId}
+            <if test="param.roleInTask !=null and param.roleInTask == 0">
+                and a.CREATE_ID=#{param.loginId}
 
-        </if>
-        <if test="param.roleInTask !=null and param.roleInTask == 1">
-            and a.HANDLE_PERSON_ID=#{param.loginId}
-        </if>
-   </where>
+            </if>
+            <if test="param.roleInTask !=null and param.roleInTask == 1">
+                and a.HANDLE_PERSON_ID=#{param.loginId}
+            </if>
+        </where>
         order by a.id desc
     </select>
 </mapper>