From 0b44562b58ca0a49bccbd1dc55e3a04b9d41b051 Mon Sep 17 00:00:00 2001 From: wxr Date: Thu, 4 Dec 2025 11:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=89=E5=AE=A1=E6=A0=B8=E9=80=80?= =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E5=88=86=E6=9E=90=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/controller/vo/BusinessAssayTaskRespVO.java | 2 ++ .../bus/service/SampleAnalysisAuditServiceImpl.java | 7 ++++--- .../business/bus/service/SampleAnalysisServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java index a31f6ed..450db8a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; +import com.zt.plat.module.qms.core.aspect.annotation.Dict; @Schema(description = "管理后台 - 检测任务分配业务 Response VO") @Data @@ -120,6 +121,7 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved") private String finishStatus; + @Dict(dicCode = "flow_status") @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1") @ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved") private String flowStatus; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java index 0439190..6d891bb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java @@ -439,8 +439,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId); if (QmsCommonConstant.APPROVE.equals(auditStatus)) { - businessAssayTaskDO.setFinishStatus(QmsCommonConstant.APPROVED); - businessAssayTaskDO.setFlowStatus(QmsCommonConstant.APPROVED); + businessAssayTaskDO.setFinishStatus(QmsCommonConstant.COMPLETED); + businessAssayTaskDO.setFlowStatus(QmsCommonConstant.COMPLETED); businessAssayTaskDO.setReportTime(LocalDateTime.now()); businessAssayTaskDO.setReportOperator(SecurityFrameworkUtils.getLoginUserNickname()); businessAssayTaskDO.setReportOperatorId(SecurityFrameworkUtils.getLoginUserId()); @@ -643,8 +643,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic } else { + businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SAVED); businessAssayTaskDO.setFinishStatus(QmsCommonConstant.PENDING); - businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START); + businessAssayTaskDO.setFlowStatus(QmsCommonConstant.RETURNED); } businessAssayTaskMapper.updateById(businessAssayTaskDO); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java index c3b66aa..fcdd15c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java @@ -1098,8 +1098,8 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId); businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SUBMITTED); businessAssayTaskDO.setAssaySubmitTime(LocalDateTime.now()); - businessAssayTaskDO.setFinishStatus(QmsCommonConstant.NOT_START); - businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START); + businessAssayTaskDO.setFinishStatus(QmsCommonConstant.IN_PROGRESS); + businessAssayTaskDO.setFlowStatus(QmsCommonConstant.IN_PROGRESS); businessAssayTaskMapper.updateById(businessAssayTaskDO); }