From c7a673b88ae70a9fae9663eb67ef2f71186caafa Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 15 Oct 2025 19:22:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/qms/enums/QmsCommonConstant.java | 4 +- .../vo/BusinessAssayTaskPageReqVO.java | 56 +++++++++----- .../vo/BusinessAssayTaskRespVO.java | 76 +++++++++++-------- .../vo/BusinessAssayTaskSaveReqVO.java | 71 +++++++++-------- .../dal/dataobject/BusinessAssayTaskDO.java | 65 +++++++++------- .../dal/mapper/BusinessAssayTaskMapper.java | 16 ++-- .../SampleEntrustGenSampleDataCmp.java | 2 +- .../taskassign/SampleTaskAssignMethodCmp.java | 14 ++-- .../taskassign/SampleTaskAssignSampleCmp.java | 10 ++- .../SampleAnalysisAuditServiceImpl.java | 2 +- .../service/SampleAnalysisServiceImpl.java | 7 +- .../service/SampleTaskAssignServiceImpl.java | 8 +- 12 files changed, 193 insertions(+), 138 deletions(-) diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java index ef801e1..2d7e203 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java @@ -45,10 +45,10 @@ public interface QmsCommonConstant { String SAVED = "saved"; /** 提交 **/ - String SUBMIT = "submit"; + //String SUBMIT = "submit"; /** 已提交 **/ - //String SUBMITTED = "submitted"; + String SUBMITTED = "submitted"; /** 未开始 **/ String NOT_START = "not_start"; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java index d921401..7a515e4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java @@ -16,27 +16,34 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "指派编号") private String taskNo; - @Schema(description = "指派单名称", example = "芋艿") + @Schema(description = "指派单名称", example = "张三") private String taskName; - @Schema(description = "检测方法配置ID", example = "20503") + @Schema(description = "检测方法配置ID", example = "13609") private Long configAssayMethodId; - @Schema(description = "任务单来源", example = "2") - private String taskSourceType; - - @Schema(description = "任务单模板ID", example = "13752") + @Schema(description = "任务单模板ID", example = "4389") private Long configReportTemplateId; @Schema(description = "任务单模板key") private String configReportTemplateKey; - @Schema(description = "指派人") - private String taskOperator; + @Schema(description = "任务单来源,分配-task_assign、领取-task_claim", example = "1") + private String taskSourceType; - @Schema(description = "指派时间") + @Schema(description = "任务单分配人") + private String taskAssignOperator; + + @Schema(description = "任务单分配时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] taskOperatorTime; + private LocalDateTime[] taskAssignTime; + + @Schema(description = "任务单分配状态,进行中-in_progress、已提交-submitted、作废-void", example = "2") + private String taskAssignStatus; + + @Schema(description = "任务单分配提交时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] taskAssignSubmitTime; @Schema(description = "分析人") private String assayOperator; @@ -45,6 +52,16 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assayTime; + @Schema(description = "分析提交时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] assaySubmitTime; + + @Schema(description = "任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted", example = "1") + private String taskAssayStatus; + + @Schema(description = "分析状态列表") + private List taskAssayStatusList; + @Schema(description = "上报时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; @@ -52,20 +69,17 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "上报人") private String reportOperator; - @Schema(description = "提交时间") + @Schema(description = "任务单完成时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] submitTime; + private LocalDateTime[] taskFinishTime; - @Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", example = "1") - private String taskStatus; - - @Schema(description = "标样业务ID", example = "11493") + @Schema(description = "标样业务ID", example = "27168") private Long standardSampleId; @Schema(description = "标样编号") private String standardSampleCode; - @Schema(description = "标准样类型ID", example = "18274") + @Schema(description = "标准样类型ID", example = "11282") private Long standardSampleTypeId; @Schema(description = "质控样编号") @@ -75,10 +89,10 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] qualitySampleAssayTime; - @Schema(description = "流程实例id", example = "32335") + @Schema(description = "流程实例id", example = "19026") private Long flowInstanceId; - @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "3868") + @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "9742") private Long formDataCollectionId; @Schema(description = "顶部字段值") @@ -87,10 +101,10 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "签名信息") private String documentSignature; - @Schema(description = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交", example = "2") + @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2") private String finishStatus; - @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", example = "2") + @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1") private String flowStatus; @Schema(description = "所属部门") 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 cdbf2a4..410d1bd 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 @@ -2,8 +2,6 @@ package com.zt.plat.module.qms.business.bus.controller.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; @@ -12,7 +10,7 @@ import com.alibaba.excel.annotation.*; @ExcelIgnoreUnannotated public class BusinessAssayTaskRespVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31525") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11667") @ExcelProperty("ID") private Long id; @@ -20,31 +18,41 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("指派编号") private String taskNo; - @Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @ExcelProperty("指派单名称") private String taskName; - @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20503") + @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609") @ExcelProperty("检测方法配置ID") private Long configAssayMethodId; - @Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @ExcelProperty("任务单来源") - private String taskSourceType; - - @Schema(description = "任务单模板ID", example = "13752") + @Schema(description = "任务单模板ID", example = "4389") + @ExcelProperty("任务单模板ID") private Long configReportTemplateId; @Schema(description = "任务单模板key") + @ExcelProperty("任务单模板key") private String configReportTemplateKey; - @Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("指派人") - private String taskOperator; + @Schema(description = "任务单来源,分配-task_assign、领取-task_claim", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("任务单来源,分配-task_assign、领取-task_claim") + private String taskSourceType; - @Schema(description = "指派时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("指派时间") - private LocalDateTime taskOperatorTime; + @Schema(description = "任务单分配人", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("任务单分配人") + private String taskAssignOperator; + + @Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("任务单分配时间") + private LocalDateTime taskAssignTime; + + @Schema(description = "任务单分配状态,进行中-in_progress、已提交-submitted、作废-void", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("任务单分配状态,进行中-in_progress、已提交-submitted") + private String taskAssignStatus; + + @Schema(description = "任务单分配提交时间") + @ExcelProperty("任务单分配提交时间") + private LocalDateTime taskAssignSubmitTime; @Schema(description = "分析人") @ExcelProperty("分析人") @@ -54,6 +62,14 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("分析时间") private LocalDateTime assayTime; + @Schema(description = "分析提交时间") + @ExcelProperty("分析提交时间") + private LocalDateTime assaySubmitTime; + + @Schema(description = "任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted", example = "1") + @ExcelProperty("任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted") + private String taskAssayStatus; + @Schema(description = "上报时间") @ExcelProperty("上报时间") private LocalDateTime reportTime; @@ -62,15 +78,11 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("上报人") private String reportOperator; - @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("提交时间") - private LocalDateTime submitTime; + @Schema(description = "任务单完成时间") + @ExcelProperty("任务单完成时间") + private LocalDateTime taskFinishTime; - @Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交") - private String taskStatus; - - @Schema(description = "标样业务ID", example = "11493") + @Schema(description = "标样业务ID", example = "27168") @ExcelProperty("标样业务ID") private Long standardSampleId; @@ -78,7 +90,7 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("标样编号") private String standardSampleCode; - @Schema(description = "标准样类型ID", example = "18274") + @Schema(description = "标准样类型ID", example = "11282") @ExcelProperty("标准样类型ID") private Long standardSampleTypeId; @@ -90,11 +102,11 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("质控样分析时间") private LocalDateTime qualitySampleAssayTime; - @Schema(description = "流程实例id", example = "32335") + @Schema(description = "流程实例id", example = "19026") @ExcelProperty("流程实例id") private Long flowInstanceId; - @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", requiredMode = Schema.RequiredMode.REQUIRED, example = "3868") + @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "9742") @ExcelProperty("顶部字段数据集ID,T_DAT_COLT_FLD") private Long formDataCollectionId; @@ -106,15 +118,15 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("签名信息") private String documentSignature; - @Schema(description = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @ExcelProperty("完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交") + @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2") + @ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved") private String finishStatus; - @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @ExcelProperty("流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成") + @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1") + @ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved") private String flowStatus; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "所属部门") @ExcelProperty("所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java index 423cba5..b95d9ce 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java @@ -5,44 +5,55 @@ import lombok.*; import java.util.*; import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; + +import com.alibaba.excel.annotation.ExcelProperty; + import java.time.LocalDateTime; @Schema(description = "管理后台 - 检测任务分配业务新增/修改 Request VO") @Data public class BusinessAssayTaskSaveReqVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31525") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11667") private Long id; @Schema(description = "指派编号", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "指派编号不能为空") private String taskNo; - @Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @NotEmpty(message = "指派单名称不能为空") private String taskName; - @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20503") + @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609") @NotNull(message = "检测方法配置ID不能为空") private Long configAssayMethodId; - @Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "任务单来源不能为空") - private String taskSourceType; - - @Schema(description = "任务单模板ID", example = "13752") + @Schema(description = "任务单模板ID", example = "4389") private Long configReportTemplateId; @Schema(description = "任务单模板key") private String configReportTemplateKey; - @Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "指派人不能为空") - private String taskOperator; + @Schema(description = "任务单来源,分配-task_assign、领取-task_claim", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "任务单来源,分配-task_assign、领取-task_claim不能为空") + private String taskSourceType; - @Schema(description = "指派时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "指派时间不能为空") - private LocalDateTime taskOperatorTime; + @Schema(description = "任务单分配人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "任务单分配人不能为空") + private String taskAssignOperator; + + @Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "任务单分配时间不能为空") + private LocalDateTime taskAssignTime; + + @Schema(description = "任务单分配状态,进行中-in_progress、已提交-submitted、作废-void", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "任务单分配状态,进行中-in_progress、已提交-submitted不能为空、作废-void") + private String taskAssignStatus; + + @Schema(description = "任务单分配提交时间") + @ExcelProperty("任务单分配提交时间") + private LocalDateTime taskAssignSubmitTime; @Schema(description = "分析人") private String assayOperator; @@ -50,27 +61,28 @@ public class BusinessAssayTaskSaveReqVO { @Schema(description = "分析时间") private LocalDateTime assayTime; + @Schema(description = "分析提交时间") + private LocalDateTime assaySubmitTime; + + @Schema(description = "任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted", example = "1") + private String taskAssayStatus; + @Schema(description = "上报时间") private LocalDateTime reportTime; @Schema(description = "上报人") private String reportOperator; - @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "提交时间不能为空") - private LocalDateTime submitTime; + @Schema(description = "任务单完成时间") + private LocalDateTime taskFinishTime; - @Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotEmpty(message = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交不能为空") - private String taskStatus; - - @Schema(description = "标样业务ID", example = "11493") + @Schema(description = "标样业务ID", example = "27168") private Long standardSampleId; @Schema(description = "标样编号") private String standardSampleCode; - @Schema(description = "标准样类型ID", example = "18274") + @Schema(description = "标准样类型ID", example = "11282") private Long standardSampleTypeId; @Schema(description = "质控样编号") @@ -79,11 +91,10 @@ public class BusinessAssayTaskSaveReqVO { @Schema(description = "质控样分析时间") private LocalDateTime qualitySampleAssayTime; - @Schema(description = "流程实例id", example = "32335") + @Schema(description = "流程实例id", example = "19026") private Long flowInstanceId; - @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", requiredMode = Schema.RequiredMode.REQUIRED, example = "3868") - @NotNull(message = "顶部字段数据集ID,T_DAT_COLT_FLD不能为空") + @Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "9742") private Long formDataCollectionId; @Schema(description = "顶部字段值") @@ -92,15 +103,13 @@ public class BusinessAssayTaskSaveReqVO { @Schema(description = "签名信息") private String documentSignature; - @Schema(description = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交不能为空") + @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2") private String finishStatus; - @Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成不能为空") + @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1") private String flowStatus; - @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "所属部门") private String systemDepartmentCode; @Schema(description = "备注") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java index 71dd0f2..6325761 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java @@ -2,13 +2,7 @@ package com.zt.plat.module.qms.business.bus.dal.dataobject; import lombok.*; import java.util.*; - import java.time.LocalDateTime; - import java.time.LocalDateTime; - import java.time.LocalDateTime; - import java.time.LocalDateTime; - import java.time.LocalDateTime; - import java.time.LocalDateTime; - import java.time.LocalDateTime; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; /** @@ -52,11 +46,6 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("CFG_ASY_MTHD_ID") private Long configAssayMethodId; /** - * 任务单来源 - */ - @TableField("TSK_SRC_TP") - private String taskSourceType; - /** * 任务单模板ID */ @TableField("CFG_RPT_TMPL_ID") @@ -67,15 +56,30 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("CFG_RPT_TMPL_KY") private String configReportTemplateKey; /** - * 指派人 + * 任务单来源,分配-task_assign、领取-task_claim */ - @TableField("TSK_OPTR") - private String taskOperator; + @TableField("TSK_SRC_TP") + private String taskSourceType; /** - * 指派时间 + * 任务单分配人 */ - @TableField("TSK_OPTR_TM") - private LocalDateTime taskOperatorTime; + @TableField("TSK_ASN_OPTR") + private String taskAssignOperator; + /** + * 任务单分配时间 + */ + @TableField("TSK_ASN_TM") + private LocalDateTime taskAssignTime; + /** + * 任务单分配状态,进行中-in_progress、已提交-submitted、作废-void + */ + @TableField("TSK_ASN_STS") + private String taskAssignStatus; + /** + * 任务单分配提交时间 + */ + @TableField("TSK_ASN_SBM_TM") + private LocalDateTime taskAssignSubmitTime; /** * 分析人 */ @@ -87,6 +91,16 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("ASY_TM") private LocalDateTime assayTime; /** + * 分析提交时间 + */ + @TableField("ASY_SBM_TM") + private LocalDateTime assaySubmitTime; + /** + * 任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted + */ + @TableField("TSK_ASY_STS") + private String taskAssayStatus; + /** * 上报时间 */ @TableField("RPT_TM") @@ -97,15 +111,10 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("RPT_OPTR") private String reportOperator; /** - * 提交时间 + * 任务单完成时间 */ - @TableField("SBM_TM") - private LocalDateTime submitTime; - /** - * 指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交 - */ - @TableField("TSK_STS") - private String taskStatus; + @TableField("TSK_FIN_TM") + private LocalDateTime taskFinishTime; /** * 标样业务ID */ @@ -152,12 +161,12 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("DOC_SIG") private String documentSignature; /** - * 完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交 + * 完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved */ @TableField("FIN_STS") private String finishStatus; /** - * 流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成 + * 流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved */ @TableField("FLW_STS") private String flowStatus; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java index aa756a1..228f799 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java @@ -4,8 +4,6 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; import com.zt.plat.module.qms.business.bus.controller.vo.*; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskExtendRespVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskPageReqVO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO; @@ -29,17 +27,21 @@ public interface BusinessAssayTaskMapper extends BaseMapperX valList = entry.getValue(); 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 49dc028..d2b31a7 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 @@ -249,7 +249,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId); if (QmsCommonConstant.APPROVE.equals(auditStatus)) { - businessAssayTaskDO.setFinishStatus(QmsCommonConstant.COMPLETED); + businessAssayTaskDO.setFinishStatus(QmsCommonConstant.APPROVED); businessAssayTaskDO.setFlowStatus(QmsCommonConstant.APPROVED); businessAssayTaskDO.setReportTime(LocalDateTime.now()); businessAssayTaskDO.setReportOperator(SecurityFrameworkUtils.getLoginUserNickname()); 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 cc2088c..08ddff3 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 @@ -188,7 +188,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(vo.getBusinessAssayTaskId()); businessAssayTaskDO.setFormValue(vo.getFormValue()); businessAssayTaskDO.setAssayTime(vo.getAssayTime()); - + businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SAVED); //赋值数据集id if (vo.getDataCollectionId() == null) { ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId()); @@ -305,8 +305,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { public void submitSampleAnalysisByTaskId(Long businessAssayTaskId) { String loginUserNickname = SecurityFrameworkUtils.getLoginUserNickname(); BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId); - businessAssayTaskDO.setReportOperator(loginUserNickname); - businessAssayTaskDO.setReportTime(LocalDateTime.now()); + businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SUBMITTED); + businessAssayTaskDO.setAssaySubmitTime(LocalDateTime.now()); + businessAssayTaskDO.setFinishStatus(QmsCommonConstant.NOT_START); businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START); businessAssayTaskMapper.updateById(businessAssayTaskDO); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java index 44b9ee8..018a730 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java @@ -117,8 +117,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { @Transactional(rollbackFor = Exception.class) public void submitAssign(Long id) { BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(id); - businessAssayTaskDO.setTaskStatus(QmsCommonConstant.SUBMIT); - businessAssayTaskDO.setSubmitTime(LocalDateTime.now()); + businessAssayTaskDO.setTaskAssignStatus(QmsCommonConstant.SUBMITTED); + businessAssayTaskDO.setTaskAssignSubmitTime(LocalDateTime.now()); businessAssayTaskMapper.updateById(businessAssayTaskDO); } @@ -126,10 +126,10 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { @Transactional(rollbackFor = Exception.class) public void voidAssign(Long id) { BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(id); - if (QmsCommonConstant.SUBMIT.equals(businessAssayTaskDO.getTaskStatus())) { + if (QmsCommonConstant.SUBMITTED.equals(businessAssayTaskDO.getTaskAssignStatus())) { throw new ServiceException(500, "任务已提交，不允许作废"); } - businessAssayTaskDO.setTaskStatus(QmsCommonConstant.VOID); + businessAssayTaskDO.setTaskAssignStatus(QmsCommonConstant.VOID); List businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskDO.getId())); for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataDOList) {