diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index f5cf538..72c5208 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -29,7 +29,7 @@
* 样品状态(任务收发&任务分发使用,委托书和样品关联表中的状态):
* 1:待收入;2:待分发;3:检测中;4:检测完成;5:待归还;6:已归还;7:无需检测;8:已超期
* 实验室检定状态(实验室检测使用,实验室检定信息记录表中的状态):
- * 1:待分配(负责人);2:待检测(检定人);3:检测完成;4:退回
+ * 1:待分配(负责人);2:待检测(检定人);3:检测完成;4:退回;5:终止(已收入中点击终止更新实验室中待分配和待检测的的状态为已终止)
*
*
* @author wangpeng
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index f5cf538..72c5208 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -29,7 +29,7 @@
* 样品状态(任务收发&任务分发使用,委托书和样品关联表中的状态):
* 1:待收入;2:待分发;3:检测中;4:检测完成;5:待归还;6:已归还;7:无需检测;8:已超期
* 实验室检定状态(实验室检测使用,实验室检定信息记录表中的状态):
- * 1:待分配(负责人);2:待检测(检定人);3:检测完成;4:退回
+ * 1:待分配(负责人);2:待检测(检定人);3:检测完成;4:退回;5:终止(已收入中点击终止更新实验室中待分配和待检测的的状态为已终止)
*
*
* @author wangpeng
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/AssigneeTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/AssigneeTypeEnum.java
new file mode 100644
index 0000000..32fe974
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/AssigneeTypeEnum.java
@@ -0,0 +1,13 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/02/09 16:00
+ */
+public interface AssigneeTypeEnum {
+ //1具体人员 2角色 3部门
+ String USER = "1";
+ String ROLE = "2";
+ String DEPT = "3";
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index f5cf538..72c5208 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -29,7 +29,7 @@
* 样品状态(任务收发&任务分发使用,委托书和样品关联表中的状态):
* 1:待收入;2:待分发;3:检测中;4:检测完成;5:待归还;6:已归还;7:无需检测;8:已超期
* 实验室检定状态(实验室检测使用,实验室检定信息记录表中的状态):
- * 1:待分配(负责人);2:待检测(检定人);3:检测完成;4:退回
+ * 1:待分配(负责人);2:待检测(检定人);3:检测完成;4:退回;5:终止(已收入中点击终止更新实验室中待分配和待检测的的状态为已终止)
*
*
* @author wangpeng
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/AssigneeTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/AssigneeTypeEnum.java
new file mode 100644
index 0000000..32fe974
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/AssigneeTypeEnum.java
@@ -0,0 +1,13 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/02/09 16:00
+ */
+public interface AssigneeTypeEnum {
+ //1具体人员 2角色 3部门
+ String USER = "1";
+ String ROLE = "2";
+ String DEPT = "3";
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index 0e2ecd2..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
import com.casic.missiles.enums.AssigneeSetTypeEnum;
+import com.casic.missiles.enums.AssigneeTypeEnum;
import com.casic.missiles.mapper.system.SystemFlowFormMapper;
import com.casic.missiles.model.system.SystemFlowForm;
import com.casic.missiles.modular.system.dao.DeptMapper;
@@ -92,9 +93,9 @@
JSONObject jsonObject1 = (JSONObject) iterator.next();
String targetId = jsonObject1.getString("targetId");
//1具体人员 2角色 3部门
- if ("1".equals(jsonObject1.getString("type"))) {
+ if (AssigneeTypeEnum.USER.equals(jsonObject1.getString("type"))) {
assigneeList.add(targetId);
- } else if ("2".equals(jsonObject1.getString("type"))) {
+ } else if (AssigneeTypeEnum.ROLE.equals(jsonObject1.getString("type"))) {
//按角色查询用户id
QueryWrapper ruWrapper = new QueryWrapper<>();
ruWrapper.eq("ROLEID", targetId);
@@ -103,7 +104,7 @@
List collect = ruRelations.stream().map(RuRelation::getUserId).map(x -> x + "").collect(Collectors.toList());
assigneeList.addAll(collect);
}
- } else if ("3".equals(jsonObject1.getString("type"))) {
+ } else if (AssigneeTypeEnum.DEPT.equals(jsonObject1.getString("type"))) {
//按部门查询用户id
List