12chenyi

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

@@ -126,6 +126,12 @@ public class ReportVO extends BaseVO {
     @Schema(description = "选中人员")
     private List<Integer> PersonnelIds;
 
+    @Schema(description = "排序字段")
+    private String OrderBy;
+
+    @Schema(description = "是否逆序 0:升序，1:降序")
+    private Integer orderDesc;
+
     @Schema(description = "选中人员")
     private List<Integer> scenarioList;
 }

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

@@ -75,7 +75,8 @@ public class TaskReportVO extends BaseVO {
 
     @Schema(description = "登录人在任务中的身份 0创建人 1处理人")
     private Integer roleInTask;
-
+    @Schema(description = "标的专利号")
+    private String signPatentNo;
     /**
      * 结果
      */

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

@@ -21,8 +21,10 @@ import java.util.List;
 @Accessors(chain = true)
 @Schema(description="任务VO",required = true)
 public class TaskVO extends BaseVO {
+    @Schema(description = "创建人姓名")
     private String createName;
-
+    @Schema(description = "处理人姓名")
+    private String handlePersonName;
     @Schema(description = "报告信息")
     private Report report;
     @Schema(description = "报告Id")
@@ -66,6 +68,7 @@ public class TaskVO extends BaseVO {
     private List<Integer> taskStatuses;
 
     private List<Integer> ids;
+    private List<Integer> handleIds;
     @Schema(description = "人员专题号对象")
     @Data
     public static class personPatents{

RMS/src/main/java/cn/cslg/report/controller/TempleController.java

@@ -11,6 +11,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Tag(name = "报告模板")
 @RestController

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -127,7 +127,9 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         if (reportVO.getSignPatentNo() != null && reportVO.getSignPatentNo() != "") {
             queryWrapper.like(Report::getSignPatentNo, reportVO.getSignPatentNo());
         }
-        queryWrapper.orderByDesc(Report::getCreateTime);
+        String orderBy ="";
+        String orderType="";
+        queryWrapper.last(" order by "+orderBy+" "+orderType);
         //分页
         if (reportVO.getSize() != null && reportVO.getCurrent() != null) {
             SecurityUtils.startDataScope("/pcs/report/query");
@@ -138,10 +140,12 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             return Response.success(reports, DataUtils.setPageColumn(reportVO.getSize(), reportVO.getCurrent(), Math.toIntExact(count)));
         }
         else {
-            queryWrapper.orderByDesc(Report::getId);
+            SecurityUtils.startDataScope("/pcs/report/query");
             List<Report> reports = this.list(queryWrapper);
+            SecurityUtils.startDataScope("/pcs/report/query");
+            long count =this.count(queryWrapper);
             reports = this.reportData(reports);
-            return Response.success(reports);
+            return Response.success(reports, DataUtils.setPageColumn(0, 0, Math.toIntExact(count)));
         }
     }
 

RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -158,7 +158,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             taskVO.setTaskStatuses(Arrays.asList(1,2));
         }
         IPage<TaskReportVO> dataPage = new Page<>();
-        //当查询未使用发起人名称时
+        //当查询使用发起人名称时
         if(taskVO.getCreateName()!=null&&taskVO.getCreateName()!=""){
         String res =outInterfaceService.getPersonIdByNamePCS(taskVO.getCreateName());
         List<Integer> createIds =  JSONArray.parseArray(res,Integer.class);
@@ -168,6 +168,16 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
            taskVO.setIds(Arrays.asList(-1));
             }
         }
+        //当查询使用处理人名称时
+        if(taskVO.getHandlePersonName()!=null&&taskVO.getHandlePersonName()!=""){
+            String res =outInterfaceService.getPersonIdByNamePCS(taskVO.getHandlePersonName());
+            List<Integer> handleIds =  JSONArray.parseArray(res,Integer.class);
+            taskVO.setHandleIds(handleIds);
+            //当未查询到时直接返回空页
+            if(handleIds==null||handleIds.size()==0){
+                taskVO.setIds(Arrays.asList(-1));
+            }
+        }
         dataPage = baseMapper.queryTasks(new Page<>(taskVO.getCurrent(), taskVO.getSize()), taskVO);
         List<TaskReportVO>  taskReportVOS =   dataPage.getRecords();
         taskReportVOS =this.reTaskReportVOs(taskReportVOS);
@@ -193,9 +203,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 List<Personnel> mapDuty = personnels.stream().filter(tem -> tem.getId().equals(item.getHandlePersonId())).collect(Collectors.toList());
                 if(mapCre.size()!=0)
                     item.setCreateName(mapCre.get(0).getPersonnelName());
-                if(mapDuty.size()!=0&&item.getHandlePersonName() ==null){
+                if(mapDuty.size()!=0){
                     item.setHandlePersonName(mapDuty.get(0).getPersonnelName());}
-                //装载部门名
 
             }
         }

RMS/src/main/java/cn/cslg/report/service/business/TemplateService.java

@@ -29,5 +29,4 @@ public class TemplateService extends ServiceImpl<TemplateMapper, Template> {
 
      }
 
-
 }

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

@@ -38,9 +38,7 @@
             <if test="searchPolicy != null">
                 SEARCH_POLICY = #{searchPolicy},
             </if>
-            <if test="deadLine != null">
                 DEADLINE = #{deadLine},
-            </if>
             <if test="focusInformation != null">
                 FOCUS_INFORMATION = #{focusInformation},
             </if>
@@ -88,6 +86,7 @@
                  left join REPORT_FILE rf on apf.FILE_ID = rf.ID
         where REPORT_ID = #{reportId}
         order by rf_ID
+  limit 1;
     </select>
 
     <resultMap id="WholeResultMap" type="cn.cslg.report.common.model.vo.ProductIncludeFilesVO">

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

@@ -2,7 +2,7 @@
 <!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 from TASK a left join REPORT b on a.REPORT_ID=b.ID
+   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}
@@ -19,6 +19,12 @@ and a.TASK_STATUS in
                 #{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}, '%')
 

RMS/target/classes/mapper/ProductMapper.xml

@@ -38,9 +38,7 @@
             <if test="searchPolicy != null">
                 SEARCH_POLICY = #{searchPolicy},
             </if>
-            <if test="deadLine != null">
                 DEADLINE = #{deadLine},
-            </if>
             <if test="focusInformation != null">
                 FOCUS_INFORMATION = #{focusInformation},
             </if>
@@ -88,6 +86,7 @@
                  left join REPORT_FILE rf on apf.FILE_ID = rf.ID
         where REPORT_ID = #{reportId}
         order by rf_ID
+  limit 1;
     </select>
 
     <resultMap id="WholeResultMap" type="cn.cslg.report.common.model.vo.ProductIncludeFilesVO">