1.11 lrj

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

@@ -65,6 +65,7 @@ public class TaskVO extends BaseVO {
 
     private List<Integer> taskStatuses;
 
+    private List<Integer> ids;
     @Schema(description = "人员专题号对象")
     @Data
     public static class personPatents{

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -535,4 +535,14 @@ public class OutInterfaceService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+
+    public String getPersonIdByNamePCS(String personName) throws IOException {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(PCSUrl + "/permission/api/system/getPersonIdByName?personName="+personName)
+                .get()
+                .build();
+
+        return  Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
 }

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

@@ -142,7 +142,18 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         {
             taskVO.setTaskStatuses(Arrays.asList(1,2));
         }
-        IPage<TaskReportVO> dataPage = baseMapper.queryTasks(new Page<>(taskVO.getCurrent(), taskVO.getSize()), taskVO);
+        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);
+            taskVO.setIds(createIds);
+            //当未查询到时直接返回空页
+            if(createIds==null||createIds.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);
    dataPage.setRecords(taskReportVOS);

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

@@ -13,9 +13,11 @@ and a.TASK_STATUS in
                 #{item}
             </foreach>
         </if>
-        <if test="param.createName !=null and param.createName !='' ">
-and a.CREATE_NAME like concat('%', #{param.createName}, '%')
-
+        <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.taskName !=null and param.taskName !=''">
 and a.TASK_NAME  like concat('%', #{param.taskName}, '%')