新增:知识库审批新增所属项目,创建人,分析方向等字段。
This commit is contained in:
@@ -32,7 +32,10 @@ import com.sdm.common.utils.CidSysUserUtil;
|
||||
import com.sdm.common.utils.PageUtils;
|
||||
import com.sdm.common.utils.ProjectUtil;
|
||||
import com.sdm.data.model.bo.ApprovalFileDataContentsModel;
|
||||
import com.sdm.data.model.entity.*;
|
||||
import com.sdm.data.model.entity.FileMetadataExtension;
|
||||
import com.sdm.data.model.entity.FileMetadataInfo;
|
||||
import com.sdm.data.model.entity.FileStorage;
|
||||
import com.sdm.data.model.entity.FileUserPermission;
|
||||
import com.sdm.data.model.req.*;
|
||||
import com.sdm.data.model.resp.KKFileViewURLFromMinioResp;
|
||||
import com.sdm.data.service.*;
|
||||
@@ -1981,21 +1984,29 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
|
||||
* 生成包含 id 和 contents 的 JSON 字符串--审批创建的 approveContents
|
||||
*/
|
||||
public String getApproveContents(List<Long> ids, String contents,Integer approveAction,List<FileMetadataInfo> beforeDatas,List<FileMetadataInfo> afterDatas) {
|
||||
|
||||
ApprovalFileDataContentsModel contentsModel = new ApprovalFileDataContentsModel();
|
||||
contentsModel.setIds(ids);
|
||||
contentsModel.setContents(contents);
|
||||
contentsModel.setApproveAction(approveAction);
|
||||
if(CollectionUtils.isNotEmpty(beforeDatas)){
|
||||
setCreatorNames(beforeDatas);
|
||||
setProjectName(beforeDatas);
|
||||
setAnalysisDirectionName(beforeDatas);
|
||||
}
|
||||
contentsModel.setBeforeData(beforeDatas);
|
||||
// 只有修改有 afterData 值
|
||||
if(Objects.equals(NumberConstants.TWO,approveAction)){
|
||||
if(CollectionUtils.isNotEmpty(afterDatas)){
|
||||
setCreatorNames(afterDatas);
|
||||
setProjectName(afterDatas);
|
||||
setAnalysisDirectionName(afterDatas);
|
||||
}
|
||||
contentsModel.setAfterData(afterDatas);
|
||||
}
|
||||
// 转换为 JSON 字符串并返回
|
||||
return JSONObject.toJSONString(contentsModel);
|
||||
}
|
||||
|
||||
|
||||
private void setCreatorNames(List<FileMetadataInfo> list) {
|
||||
try {
|
||||
if (ObjectUtils.isNotEmpty(list)) {
|
||||
@@ -2185,8 +2196,6 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
|
||||
resp.setBusinessId(req.getBusinessId());
|
||||
resp.setUploadTaskId(req.getUploadTaskId());
|
||||
resp.setFileTempPath(fileTempPath);
|
||||
// 成功时,错误信息通常为空
|
||||
resp.setErrMsg("");
|
||||
return SdmResponse.success(resp);
|
||||
}
|
||||
|
||||
@@ -2195,9 +2204,8 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
|
||||
resp.setResult(false);
|
||||
resp.setBusinessId(req.getBusinessId());
|
||||
resp.setUploadTaskId(req.getUploadTaskId());
|
||||
// 如果 errMsg 为 null,设置为空字符串 ""
|
||||
resp.setErrMsg(errMsg != null ? errMsg : "");
|
||||
return SdmResponse.failed(resp);
|
||||
CoreLogger.error("chunkUploadMinio error:{}",JSONObject.toJSONString(resp));
|
||||
return SdmResponse.failed(errMsg != null ? errMsg : "");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user