修复文件ossbug全部改用ossId二次请求方式

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/EmployeeFilesServiceImpl.java

@@ -83,7 +83,7 @@ public class EmployeeFilesServiceImpl implements IEmployeeFilesService {
     @Override
     public Boolean insertByBo(UserFilesVo userFilesVo) {
         // 删除该用户所有的文件，重新填入
-        // baseMapper.deleteByUserId(userFilesVo.getUserId()); 似乎不用删
+//        baseMapper.deleteByUserId(userFilesVo.getUserId());
         List<String> fileUrls = new ArrayList<>();
         if (userFilesVo.getUserId() != null){
             fileUrls = Arrays.stream( userFilesVo.getFiles().split(","))
@@ -93,6 +93,7 @@ public class EmployeeFilesServiceImpl implements IEmployeeFilesService {
 
         fileUrls.forEach(file -> {
             EmployeeFiles employeeFiles = new EmployeeFiles();
+            // 此处的filePath已经改为ossId
             employeeFiles.setFilePath(file);
             employeeFiles.setUserId(userFilesVo.getUserId());
             baseMapper.insert(employeeFiles);
@@ -138,7 +139,7 @@ public class EmployeeFilesServiceImpl implements IEmployeeFilesService {
         EmployeeFilesBo employeeFilesBo = new EmployeeFilesBo();
         employeeFilesBo.setUserId(userId);
         LambdaQueryWrapper<EmployeeFiles> employeeFilesLambdaQueryWrapper = buildQueryWrapper(employeeFilesBo);
-        List<EmployeeFilesVo> list = baseMapper.selectVoList(employeeFilesLambdaQueryWrapper);
+        List<EmployeeFilesVo> list = baseMapper.selectVoListPlus(employeeFilesLambdaQueryWrapper);
         userFilesVo.setFileList(list);
         return userFilesVo;
     }

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/EmployeeOnboardingServiceImpl.java

@@ -9,16 +9,22 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.oa.domain.EmployeeFiles;
 import com.ruoyi.oa.domain.EmployeeOnboarding;
 import com.ruoyi.oa.domain.bo.EmployeeOnboardingBo;
+import com.ruoyi.oa.domain.vo.EmployeeFilesVo;
 import com.ruoyi.oa.domain.vo.EmployeeOnboardingVo;
+import com.ruoyi.oa.domain.vo.FileUser;
+import com.ruoyi.oa.domain.vo.UserFilesVo;
 import com.ruoyi.oa.mapper.EmployeeOnboardingMapper;
+import com.ruoyi.oa.service.IEmployeeFilesService;
 import com.ruoyi.oa.service.IEmployeeOnboardingService;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -38,6 +44,9 @@ public class EmployeeOnboardingServiceImpl implements IEmployeeOnboardingService
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private IEmployeeFilesService employeeFilesService;
+
     /**
      * 查询入职管理
      */
@@ -108,6 +117,24 @@ public class EmployeeOnboardingServiceImpl implements IEmployeeOnboardingService
         EmployeeOnboarding update = BeanUtil.toBean(bo, EmployeeOnboarding.class);
         validEntityBeforeSave(update);
 
+        StringBuilder files = new StringBuilder();
+        if (bo.getCheckInFile() != null) {
+            files.append(bo.getCheckInFile())
+                    .append(",");
+
+        }
+        if (bo.getRegisterFile() != null) {
+            files.append(bo.getRegisterFile())
+                    .append(",");
+        }
+        if (bo.getTrainFile() != null) {
+            files.append(bo.getTrainFile())
+                    .append(",");
+        }
+        UserFilesVo filesVo = new UserFilesVo();
+        filesVo.setUserId(bo.getUserId());
+        filesVo.setFiles(String.valueOf(files));
+        employeeFilesService.insertByBo(filesVo);
         return baseMapper.updateByUserId(update);
     }
 

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java

@@ -151,9 +151,11 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
         List<Long> workerIdList = new ArrayList<>();
         // 拿到所有的执行人id列表进行遍历添加
         if (bo.getWorkerIds()!=null) {
+            System.out.println(bo.getWorkerIds());
             workerIdList = Arrays.stream(bo.getWorkerIds().split(","))
                     .map(Long::valueOf)
                     .collect(Collectors.toList());
+            System.out.println(workerIdList);
         }else{
             // 适配文件上传
             bo.setBeginTime(new Date());
@@ -166,13 +168,9 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
         for (Long workerId : workerIdList) {
             SysOaTask add = BeanUtil.toBean(bo, SysOaTask.class);
             add.setCreateUserId(LoginHelper.getUserId());
-            validEntityBeforeSave(add);
             add.setOriginFinishTime(add.getFinishTime());
             add.setWorkerId(workerId);
             flag = baseMapper.insert(add) > 0;
-            if (flag) {
-                bo.setTaskId(add.getTaskId());
-            }
             // 判断是否为报工模式
             if (bo.getStatus()==1L){
                 // 这里新增item数据，为单个条目