add: 附件列表

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

@@ -50,6 +50,7 @@ import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeResultEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeStatusEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
+import com.netease.mail.yanxuan.change.common.enums.FileTypeEnum;
 import com.netease.mail.yanxuan.change.common.enums.FlowOperationTypeEnum;
 import com.netease.mail.yanxuan.change.common.enums.FlowxOperationEnum;
 import com.netease.mail.yanxuan.change.common.enums.NeedFileEnum;
@@ -142,7 +143,7 @@ public class ChangeFlowBiz {
         Assert.notNull(changeConfig, "二级变更类型不存在");
         Integer needFile = changeConfig.getNeedFile();
         if (NeedFileEnum.NEED.getStatus().equals(needFile)) {
-            Assert.notEmpty(changeFlowCreateReq.getFiles(), "必须上传资料");
+            Assert.notEmpty(changeFlowCreateReq.getUploadFiles(), "必须上传资料");
         }
         // 变更行动项不可为空，最多20项
         List<ChangeExecConfigReq> changeExecProject = changeFlowCreateReq.getChangeExecProject();
@@ -173,11 +174,19 @@ public class ChangeFlowBiz {
         // 保存变更行动方案记录
         List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(), changeExecProject);
         changeExecRecords.forEach(exec->changeFlowExecService.saveRecord(exec));
-        // 保存附件
-        List<ChangeFlowFile> files = changeFlowCreateReq.getFiles();
-        if (CollectionUtils.isNotEmpty(files)) {
-            List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), files);
-            changeFiles.forEach(file->changeFileService.saveRecord(file));
+        List<ChangeFile> allFiles = new ArrayList<>();
+        // 变更前后图片/视频，非必填
+        List<ChangeFlowFile> changeFiles = changeFlowCreateReq.getChangeFiles();
+        if (CollectionUtils.isNotEmpty(changeFiles)) {
+            allFiles.addAll(buildChangeFileRecord(changeRecord.getId(), changeFiles, FileTypeEnum.CHANGE.getType()));
+        }
+        // 保存附件，根据配置看是否必传
+        List<ChangeFlowFile> uploadFiles = changeFlowCreateReq.getUploadFiles();
+        if (CollectionUtils.isNotEmpty(uploadFiles)) {
+            allFiles.addAll(buildChangeFileRecord(changeRecord.getId(), uploadFiles, FileTypeEnum.UPLOAD.getType()));
+        }
+        if (CollectionUtils.isNotEmpty(allFiles)) {
+            allFiles.forEach(file->changeFileService.saveRecord(file));
         }
         // 创建代办
         TaskCreateDTO todoTask = todoService.createTodoTask(changeRecord);
@@ -202,11 +211,11 @@ public class ChangeFlowBiz {
         return flowId;
     }
 
-    private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files) {
+    private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files, Integer type) {
         return files.stream().map(f -> {
             ChangeFile changeFile = new ChangeFile();
             changeFile.setChangeRecordId(changeRecordId);
-            changeFile.setFileType(f.getFileType());
+            changeFile.setFileType(type);
             changeFile.setFileName(f.getFileName());
             changeFile.setFileUrl(f.getFileUrl());
             changeFile.setCreateTime(DateUtils.getCurrentTime());
@@ -394,7 +403,7 @@ public class ChangeFlowBiz {
                 List<ChangeFlowFile> files = changeFlowSubmitReq.getFiles();
                 if (CollectionUtils.isNotEmpty(files)) {
                     changeFileService.deleteByChangeRecordId(changeRecord.getId());
-                    List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), files);
+                    List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), files, FileTypeEnum.CHANGE.getType());
                     changeFiles.forEach(file -> changeFileService.saveRecord(file));
                 }
                 // todo: 502节点，发送邮件，变更执行

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/FileTypeEnum.java

@@ -12,9 +12,9 @@ package com.netease.mail.yanxuan.change.common.enums;
  */
 public enum FileTypeEnum {
 
-    IMAGE(1, "基础信息图片"),
-    VIDEO(2, "供应商变更"),
-    NORMAL_INFO(3, "基础信息资料"),
+    CHANGE(1, "变更前后图片/视频"),
+    UPLOAD(2, "发起变更资料上传"),
+    CHANGE_RESULT(3, "基础信息资料"),
     CHANGE_RESULT_INFO(4, "变更结果资料");
 
     private Integer type;

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

@@ -82,9 +82,14 @@ public class ChangeFlowCreateReq {
     private String changeContent;
 
     /**
-     * 变更工单附件
+     * 变更前后图片/视频
      */
-    private List<ChangeFlowFile> files;
+    private List<ChangeFlowFile> changeFiles;
+
+    /**
+     * 资料上传
+     */
+    private List<ChangeFlowFile> uploadFiles;
 
     /**
      * 变更潜在风险描述
@@ -124,6 +129,11 @@ public class ChangeFlowCreateReq {
     private List<ChangeExecConfigReq> changeExecProject;
 
     /**
+     * 变更管理及行动项结果相关的资料文件
+     */
+    private List<ChangeFlowFile> changeResultFiles;
+
+    /**
      * 创建端（普通or同舟）
      */
     @NotNull(message = "创建端不能为空")