zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

交叉审核退回，分析查询不到数据

Browse Source
This commit is contained in:
王兴荣
2025-12-04 11:39:16 +08:00
parent 90a1dfbd37
commit 0b44562b58
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*; import com.alibaba.excel.annotation.*;
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
@Schema(description = "管理后台 - 检测任务分配业务 Response VO") @Schema(description = "管理后台 - 检测任务分配业务 Response VO")
@Data @Data
@@ -120,6 +121,7 @@ public class BusinessAssayTaskRespVO {
@ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved") @ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
private String finishStatus; private String finishStatus;
@Dict(dicCode = "flow_status")
@Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1") @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
@ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved") @ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
private String flowStatus; private String flowStatus;

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
View File

@@ -439,8 +439,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId); BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId);
if (QmsCommonConstant.APPROVE.equals(auditStatus)) { if (QmsCommonConstant.APPROVE.equals(auditStatus)) {
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.APPROVED); businessAssayTaskDO.setFinishStatus(QmsCommonConstant.COMPLETED);
businessAssayTaskDO.setFlowStatus(QmsCommonConstant.APPROVED); businessAssayTaskDO.setFlowStatus(QmsCommonConstant.COMPLETED);
businessAssayTaskDO.setReportTime(LocalDateTime.now()); businessAssayTaskDO.setReportTime(LocalDateTime.now());
businessAssayTaskDO.setReportOperator(SecurityFrameworkUtils.getLoginUserNickname()); businessAssayTaskDO.setReportOperator(SecurityFrameworkUtils.getLoginUserNickname());
businessAssayTaskDO.setReportOperatorId(SecurityFrameworkUtils.getLoginUserId()); businessAssayTaskDO.setReportOperatorId(SecurityFrameworkUtils.getLoginUserId());
@@ -643,8 +643,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
} else { } else {
businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SAVED);
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.PENDING); businessAssayTaskDO.setFinishStatus(QmsCommonConstant.PENDING);
businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START); businessAssayTaskDO.setFlowStatus(QmsCommonConstant.RETURNED);
} }
businessAssayTaskMapper.updateById(businessAssayTaskDO); businessAssayTaskMapper.updateById(businessAssayTaskDO);

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
View File

@@ -1098,8 +1098,8 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId); BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId);
businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SUBMITTED); businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SUBMITTED);
businessAssayTaskDO.setAssaySubmitTime(LocalDateTime.now()); businessAssayTaskDO.setAssaySubmitTime(LocalDateTime.now());
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.NOT_START); businessAssayTaskDO.setFinishStatus(QmsCommonConstant.IN_PROGRESS);
businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START); businessAssayTaskDO.setFlowStatus(QmsCommonConstant.IN_PROGRESS);
businessAssayTaskMapper.updateById(businessAssayTaskDO); businessAssayTaskMapper.updateById(businessAssayTaskDO);
} }