From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/flow/consts/FlowableConsts.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/flow/consts/FlowableConsts.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/flow/consts/FlowableConsts.java
index 1886d47..136cd30 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/flow/consts/FlowableConsts.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/flow/consts/FlowableConsts.java
@@ -13,9 +13,11 @@
* 两个默认流程定义编号
* 自行受理：GZDYH_ZXSL_3LEVEL_V1
* 来访登记：GZDYH_LFDJ_3LEVEL_V1
+ * 联合处置：GZDYH_LHCZ_3LEVEL_V1
*/
public static final String FLOWABLE_ID_LFDJ = "GZDYH_LFDJ_3LEVEL_V1";
public static final String FLOWABLE_ID_ZXSL = "GZDYH_ZXSL_3LEVEL_V1";
+ public static final String FLOWABLE_ID_LHCZ = "GZDYH_LHCZ_3LEVEL_V1";
/**
* 工作流通用任务条件，
@@ -29,7 +31,7 @@
* 自行受理：zxsl
* 交办给直属组织：jb_zszz，交办给综治中心：jb_zzzx
* 受理：sl
- * 回退申请：htsq，回退审核同意：htsh_ty，回退审核不同意：htsh_bty
+ * 回退申请：htsq，回退审核同意：htsh_ty，回退审核不同意：htsh_bty，htsh_bty_zj，htsh_bty_qj
* 上报：sb，上报审核同意：htsq_ty，上报审核不同意：htsq_bty
* 结案审核同意：jash_ty，结案审核不同意：jash_bty，htsh_bty_zj，htsh_bty_qj
*/
@@ -39,8 +41,8 @@
public static final String OPERATION_htsq = "htsq";
public static final String OPERATION_htsh_ty = "htsh_ty";
public static final String OPERATION_htsh_bty = "htsh_bty";
- public static final String OPERATION_htsh_bty_zj = "htsh_bty_zj";
public static final String OPERATION_htsh_bty_qj = "htsh_bty_qj";
+ public static final String OPERATION_htsh_bty_sj = "htsh_bty_sj";
public static final String OPERATION_sb = "sb";
public static final String OPERATION_sbsh_ty = "sbsh_ty";
public static final String OPERATION_sbsh_bty = "sbsh_bty";
--
Gitblit v1.8.0