modify:修改文件上传

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -139,9 +139,9 @@ public class ChangeFlowBiz {
             itemIds = itemVOS.stream().map(ItemVO::getItemId).collect(Collectors.toList());
         }
         // 工单负责人
-        String changeCommander;
+        String changeCommander = null;
         // 获取工单负责人
-        GoodsResponseRpc goodsResponseRpc = null;
+        GoodsResponseRpc goodsResponseRpc;
         try {
             goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(
                     ChangeCommanderPO.builder().parentChangeClassId(parentChangeClassId).sonChangeClassId(sonChangeClassId)
@@ -149,6 +149,8 @@ public class ChangeFlowBiz {
             changeCommander = goodsResponseRpc.getEmail();
         } catch (Exception e) {
             log.error("[op:queryCommanderInfo] error, e:{}", e);
+        }
+        if (changeCommander == null) {
             changeCommander = appConfig.getTestEmail();
         }
         // Assert.notNull(goodsResponseRpc, "未查询到负责人信息");
@@ -449,7 +451,11 @@ public class ChangeFlowBiz {
                 Assert.notNull(changeConfig, "二级变更类型不存在");
                 Integer needFile = changeConfig.getNeedFile();
                 if (NeedFileEnum.NEED.getStatus().equals(needFile)) {
-                    Assert.notEmpty(changeFlowSubmitReq.getFiles(), "必须上传资料");
+                    List<ChangeFlowFile> fileList = changeFlowSubmitReq.getChangeFiles();
+                    fileList.addAll(changeFlowSubmitReq.getUploadFiles());
+                    if (CollectionUtils.isEmpty(fileList)) {
+                        throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "必须上传资料");
+                    }
                 }
                 // 变更行动项不可为空，最多20项
                 List<ChangeExecConfigReq> changeExecProjectList = changeFlowSubmitReq.getChangeExecProjectList();
@@ -487,12 +493,17 @@ public class ChangeFlowBiz {
                         changeFlowSubmitReq.getChangeExecProjectList());
                 changeExecRecords.forEach(exec -> changeFlowExecService.saveRecord(exec));
                 // 更新附件，覆盖操作，先删除，后插入
-                List<ChangeFlowFile> files = changeFlowSubmitReq.getFiles();
+                changeFileService.deleteByChangeRecordId(changeRecord.getId());
+                List<ChangeFlowFile> files = changeFlowSubmitReq.getChangeFiles();
                 if (CollectionUtils.isNotEmpty(files)) {
-                    changeFileService.deleteByChangeRecordId(changeRecord.getId());
                     List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), files, FileTypeEnum.CHANGE.getType());
                     changeFiles.forEach(file -> changeFileService.saveRecord(file));
                 }
+                List<ChangeFlowFile> uploadFiles = changeFlowSubmitReq.getUploadFiles();
+                if (CollectionUtils.isNotEmpty(uploadFiles)) {
+                    List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), uploadFiles, FileTypeEnum.UPLOAD.getType());
+                    changeFiles.forEach(file -> changeFileService.saveRecord(file));
+                }
                 HashMap<String, Object> param = new HashMap<>();
                 param.put("changeId", changeRecord.getFlowId());
                 param.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowSubmitReq.java

@@ -59,9 +59,19 @@ public class ChangeFlowSubmitReq {
     private String changeContent;
 
     /**
-     * 变更工单附件
+     * 变更前后图片/视频
      */
-    private List<ChangeFlowFile> files;
+    private List<ChangeFlowFile> changeFiles;
+
+    /**
+     * 资料上传
+     */
+    private List<ChangeFlowFile> uploadFiles;
+
+    /**
+     * 变更管理及行动项结果相关的资料文件
+     */
+    private List<ChangeFlowFile> changeResultFiles;
 
     /**
      * 变更潜在风险