Commit d319b272 by 穆龙飞

modify:增加结果上传

parent e9a156ac
......@@ -520,9 +520,17 @@ public class ChangeFlowBiz {
changeRecord.setChangeResult(changeResultStatus.getStatus());
// 填写备注
changeRecord.setRemark(changeFlowSubmitReq.getRemark());
List<ChangeFlowFile> finialFiles = changeFlowSubmitReq.getFiles();
if (CollectionUtils.isNotEmpty(finialFiles)) {
changeFileService.deleteByChangeRecordIdAndType(changeRecord.getId(), FileTypeEnum.CHANGE_RESULT_INFO);
List<ChangeFile> changeFiles = buildChangeFileRecord(changeRecord.getId(), finialFiles, FileTypeEnum.CHANGE_RESULT_INFO.getType());
changeFiles.forEach(file -> changeFileService.saveRecord(file));
}
switch (changeResultStatus) {
case FINISH_ALL:
case FINISH_PART:
String reason = changeFlowSubmitReq.getCancelReason();
changeRecord.setCancelReason(reason);
List<ChangeExecConfigReq> execProjectList = changeFlowSubmitReq.getChangeExecProjectList();
List<ChangeExecRecord> changeExecRecordList = execProjectList.stream().map(exec -> {
Long changeExecFinishTime = exec.getChangeExecFinishTime();
......
......@@ -8,6 +8,7 @@ package com.netease.mail.yanxuan.change.biz.service;
import java.util.List;
import com.netease.mail.yanxuan.change.common.enums.FileTypeEnum;
import com.netease.mail.yanxuan.change.dal.entity.ChangeFile;
import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowFile;
......@@ -29,4 +30,6 @@ public interface ChangeFileService {
Integer deleteByChangeRecordId(Long changeRecordId);
void saveRecord(ChangeFile changeFile);
void deleteByChangeRecordIdAndType(Long changeRecordId, FileTypeEnum type);
}
\ No newline at end of file
......@@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import com.netease.mail.yanxuan.change.common.enums.FileTypeEnum;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -53,4 +54,9 @@ public class ChangeFileServiceImpl implements ChangeFileService {
public void saveRecord(ChangeFile changeFile) {
changeFileMapper.insertSelective(changeFile);
}
@Override
public void deleteByChangeRecordIdAndType(Long changeRecordId, FileTypeEnum type) {
changeFileMapper.deleteByBaseIdAndType(changeRecordId, type.getType());
}
}
\ No newline at end of file
......@@ -35,4 +35,7 @@ public interface ChangeFileMapper extends tk.mybatis.mapper.common.Mapper<Change
@Delete("delete from TB_YX_QC_CHANGE_FILE where change_record_id = #{changeRecordId}")
Integer deleteByBaseId(Long changeRecordId);
@Delete("delete from TB_YX_QC_CHANGE_FILE where change_record_id = #{changeRecordId} and fileType = #{type}")
void deleteByBaseIdAndType(@Param("changeRecordId") Long changeRecordId, @Param("type") Integer type);
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment