Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	RMS/target/classes/cn/cslg/report/service/business/TaskService.class

RMS/src/main/java/cn/cslg/report/mapper/ImportTaskMapper.java

@@ -3,9 +3,19 @@ package cn.cslg.report.mapper;
 import cn.cslg.report.entity.ImportTask;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
 
 @Mapper
 @SuppressWarnings({"all"})
 public interface ImportTaskMapper extends BaseMapper<ImportTask> {
+    @Delete("delete * from IMPORT_TASK where FINISH_TIME<=#{date}")
+    void dele(@Param("date") Date date );
+    @Select("select * from  IMPORT_TASK where FINISH_TIME<=#{date}")
+    List<ImportTask> find(@Param("date")Date date);
 }

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

@@ -15,6 +15,11 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 
 /**
  * @author 李仁杰
@@ -29,6 +34,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
      * @param importTask
      * @return importTask（导入任务）
      */
+    private final ImportTaskMapper mapper;
     public String reImportTask(ImportTask importTask) {
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
         if (importTask.getReportId() != null) {
@@ -66,4 +72,18 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
 
     }
 
+    /**
+     * @function :根据时间去获取文件的路径并且删除文件
+     * @param date
+     * @return
+     */
+    public List<String> findPath(Date date){
+        List<String> stringList=new ArrayList<>();
+        List<ImportTask> importTasks = mapper.find(date);
+        stringList =importTasks.stream().map(ImportTask::getFilePath).collect(Collectors.toList());
+        mapper.dele(date);
+        return stringList;
+    }
+
+
 }

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

@@ -59,6 +59,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     public final SyneryCodeService syneryCodeService;
 
 
+
     /**
      * @param id(Task 任务id)
      * @return
@@ -635,6 +636,17 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getReportId, taskVO.getReportId());
         List<Task> records = this.page(new Page<>(taskVO.getCurrent(), taskVO.getSize()), lambdaQueryWrapper).getRecords();
+        for(Task task :records){
+            Integer createID = task.getCreateID();
+            Integer handlePersonId = task.getHandlePersonId();
+            PersonnelVO loginUser = cacheUtils.getLoginUser(createID);
+            task.setCreateName(loginUser.getName());
+            PersonnelVO loginUser1 = cacheUtils.getLoginUser(handlePersonId);
+
+            task.setHandlePersonName(loginUser1.getName());
+
+
+        }
         Long count = this.count(lambdaQueryWrapper);
         return Response.success(records, DataUtils.setPageColumn(taskVO.getSize(), taskVO.getCurrent(), Math.toIntExact(count)));
 
@@ -723,7 +735,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         //任务保存部分
         Report report =reportService.getById(syneryVO.getReportId());
         PatentVO patentVO = new PatentVO();
-      List<Synery_CC> synery_ccs= syneryVO.getSyneryCCList();
+        List<Synery_CC> synery_ccs= syneryVO.getSyneryCCList();
         if (syneryVO.getPatentVO() != null) {
             patentVO = syneryVO.getPatentVO();
         }