toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修正审批通过状态bug

Browse Source
This commit is contained in:
gulongcheng
2026-01-21 17:37:16 +08:00
parent 6bb6a2c8a3
commit 81ba2b790a
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/src/main/java/com/sdm/data/service/impl/dataFileHandle/DeleteApproveStrategy.java
View File

@@ -2,6 +2,7 @@ package com.sdm.data.service.impl.dataFileHandle;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sdm.common.entity.constants.NumberConstants;
import com.sdm.common.entity.enums.ApprovalFileDataStatusEnum;
import com.sdm.common.entity.enums.ApproveFileDataTypeEnum;
import com.sdm.common.entity.enums.ApproveTypeEnum;
import com.sdm.data.model.entity.*;
@@ -49,7 +50,7 @@ public class DeleteApproveStrategy implements ApproveStrategy {
if (NumberConstants.THREE == status) {
// 恢复状态
metadata.setTempMetadata(null);
metadata.setApprovalStatus(null);
metadata.setApprovalStatus(ApprovalFileDataStatusEnum.REJECTED.getKey());
metadata.setApproveType(ApproveFileDataTypeEnum.COMPLETED.getCode());
metadata.setUpdateTime(LocalDateTime.now());
service.updateById(metadata);

5
data/src/main/java/com/sdm/data/service/impl/dataFileHandle/ModifyFileApproveStrategy.java
View File

@@ -2,6 +2,7 @@ package com.sdm.data.service.impl.dataFileHandle;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sdm.common.entity.constants.NumberConstants;
import com.sdm.common.entity.enums.ApprovalFileDataStatusEnum;
import com.sdm.common.entity.enums.ApproveFileDataTypeEnum;
import com.sdm.data.model.entity.*;
import com.sdm.data.service.*;
@@ -37,7 +38,7 @@ public class ModifyFileApproveStrategy implements ApproveStrategy {
// 审批通过
if (NumberConstants.TWO == status) {
metadata.setApprovalStatus(null);
metadata.setApprovalStatus(ApprovalFileDataStatusEnum.APPROVED.getKey());
metadata.setApproveType(ApproveFileDataTypeEnum.COMPLETED.getCode());
// 设置成最新的文件
metadata.setIsLatest(true);
@@ -63,7 +64,7 @@ public class ModifyFileApproveStrategy implements ApproveStrategy {
if (historyMetaData != null) {
historyMetaData.setTempMetadata(null);
historyMetaData.setIsLatest(true);
historyMetaData.setApprovalStatus(null);
historyMetaData.setApprovalStatus(ApprovalFileDataStatusEnum.REJECTED.getKey());
historyMetaData.setApproveType(ApproveFileDataTypeEnum.COMPLETED.getCode());
historyMetaData.setUpdateTime(LocalDateTime.now());
service.updateById(historyMetaData);

5
data/src/main/java/com/sdm/data/service/impl/dataFileHandle/ModifyMetadataApproveStrategy.java
View File

@@ -2,6 +2,7 @@ package com.sdm.data.service.impl.dataFileHandle;
import com.alibaba.fastjson2.JSONObject;
import com.sdm.common.entity.constants.NumberConstants;
import com.sdm.common.entity.enums.ApprovalFileDataStatusEnum;
import com.sdm.common.entity.enums.ApproveFileDataTypeEnum;
import com.sdm.common.entity.req.data.SimulationPoolInfo;
import com.sdm.data.model.entity.FileMetadataInfo;
@@ -36,7 +37,7 @@ public class ModifyMetadataApproveStrategy implements ApproveStrategy {
.set(FileMetadataInfo::getAnalysisDirectionId, updateInfo.getAnalysisDirectionId())
.set(FileMetadataInfo::getRemarks, updateInfo.getRemarks())
.set(FileMetadataInfo::getTempMetadata, null)
.set(FileMetadataInfo::getApprovalStatus, null)
.set(FileMetadataInfo::getApprovalStatus, ApprovalFileDataStatusEnum.APPROVED.getKey())
.set(FileMetadataInfo::getApproveType, ApproveFileDataTypeEnum.COMPLETED.getCode())
.update();
@@ -63,7 +64,7 @@ public class ModifyMetadataApproveStrategy implements ApproveStrategy {
if (NumberConstants.THREE == status) {
// 清除临时数据
metadata.setTempMetadata(null);
metadata.setApprovalStatus(null);
metadata.setApprovalStatus(ApprovalFileDataStatusEnum.REJECTED.getKey());
metadata.setApproveType(ApproveFileDataTypeEnum.COMPLETED.getCode());
service.updateById(metadata);
return true;

3
data/src/main/java/com/sdm/data/service/impl/dataFileHandle/UploadApproveStrategy.java
View File

@@ -2,6 +2,7 @@ package com.sdm.data.service.impl.dataFileHandle;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sdm.common.entity.constants.NumberConstants;
import com.sdm.common.entity.enums.ApprovalFileDataStatusEnum;
import com.sdm.common.entity.enums.ApproveFileDataTypeEnum;
import com.sdm.common.entity.enums.ApproveTypeEnum;
import com.sdm.data.model.entity.*;
@@ -31,7 +32,7 @@ public class UploadApproveStrategy implements ApproveStrategy {
// 审批通过
if (NumberConstants.TWO == status) {
approveMetadataInfos.forEach(metadata -> {
metadata.setApprovalStatus(null);
metadata.setApprovalStatus(ApprovalFileDataStatusEnum.APPROVED.getKey());
metadata.setApproveType(ApproveFileDataTypeEnum.COMPLETED.getCode());
});
service.updateBatchById(approveMetadataInfos);