From 1721a201ff8b7275e185ab19929424792dab18ae Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 15 Oct 2025 17:54:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plat/module/qms/enums/QmsCommonConstant.java | 16 ++++++++++++++-- .../taskassign/SampleTaskAssignMethodCmp.java | 2 +- .../taskassign/SampleTaskAssignSampleCmp.java | 2 +- 3 files changed, 16 insertions(+), 4 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 0d38618..ef801e1 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 @@ -27,7 +27,7 @@ public interface QmsCommonConstant { String FAILURE = "failure"; /** 已失败 **/ - String FAILED = "failed"; + //String FAILED = "failed"; /** 正常 **/ String NORMAL = "normal"; @@ -41,15 +41,21 @@ public interface QmsCommonConstant { /** 进行中 **/ String IN_PROGRESS = "in_progress"; + /** 已保存 **/ + String SAVED = "saved"; + /** 提交 **/ String SUBMIT = "submit"; /** 已提交 **/ - String SUBMITTED = "submitted"; + //String SUBMITTED = "submitted"; /** 未开始 **/ String NOT_START = "not_start"; + /** 审核中 **/ + String RUNNING = "running"; + /** 待处理 **/ String PENDING = "pending"; @@ -77,6 +83,12 @@ public interface QmsCommonConstant { /** 已完成 **/ String COMPLETED = "completed"; + /** 分配任务 **/ + String TASK_ASSIGN = "task_assign"; + + /** 领取任务 **/ + String TASK_CLAIM = "task_claim"; + /** 固定字段 **/ String FIELD_FIXED = "field_fixed"; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java index 9340860..2cbf739 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java @@ -103,7 +103,7 @@ public class SampleTaskAssignMethodCmp extends NodeComponent { businessAssayTaskDO.setTaskOperator(loginRealname); businessAssayTaskDO.setTaskOperatorTime(currentDateTime); businessAssayTaskDO.setTaskStatus("in_progress"); - businessAssayTaskDO.setTaskSourceType("分配"); + businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN); businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId()); businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey()); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java index 4f5c351..3156a99 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java @@ -98,7 +98,7 @@ public class SampleTaskAssignSampleCmp extends NodeComponent { businessAssayTaskDO.setTaskOperatorTime(currentDateTime); businessAssayTaskDO.setConfigAssayMethodId(key); businessAssayTaskDO.setTaskStatus("in_progress"); - businessAssayTaskDO.setTaskSourceType("分配"); + businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN); businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId()); businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());