From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 98c5834..3c8bcf0
--- a/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨宸ヤ綔娴佷俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessWorkflowInfo" parameterType="Map">
insert into business_workflow(
- skip_level,operate,describle,b_id,community_id,store_id,flow_id,flow_name,flow_type
+ skip_level,operate,describle,b_id,community_id,store_id,flow_id,flow_name,flow_type,process_definition_key
) values (
- #{skipLevel},#{operate},#{describle},#{bId},#{communityId},#{storeId},#{flowId},#{flowName},#{flowType}
+ #{skipLevel},#{operate},#{describle},#{bId},#{communityId},#{storeId},#{flowId},#{flowName},#{flowType},#{processDefinitionKey}
)
</insert>
@@ -18,7 +18,7 @@
<select id="getBusinessWorkflowInfo" parameterType="Map" resultType="Map">
select t.skip_level,t.skip_level skipLevel,t.operate,t.describle,t.b_id,t.b_id bId,t.community_id,t.community_id
communityId,t.store_id,t.store_id storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name
- flowName,t.flow_type,t.flow_type flowType
+ flowName,t.flow_type,t.flow_type flowType,t.process_definition_key,t.process_definition_key processDefinitionKey
from business_workflow t
where 1 =1
<if test="skipLevel !=null and skipLevel != ''">
@@ -34,7 +34,7 @@
and t.b_id= #{bId}
</if>
<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ and t.community_id in (#{communityId},'9999')
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -55,8 +55,9 @@
<!-- 淇濆瓨宸ヤ綔娴佷俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveWorkflowInfoInstance" parameterType="Map">
insert into workflow(
- skip_level,describle,status_cd,b_id,community_id,store_id,flow_id,flow_name,flow_type
- ) select t.skip_level,t.describle,'0',t.b_id,t.community_id,t.store_id,t.flow_id,t.flow_name,t.flow_type from
+ skip_level,describle,status_cd,b_id,community_id,store_id,flow_id,flow_name,flow_type,process_definition_key
+ ) select t.skip_level,t.describle,'0',t.b_id,t.community_id,t.store_id,t.flow_id,t.flow_name,t.flow_type ,t.process_definition_key
+ from
business_workflow t where 1=1
<if test="skipLevel !=null and skipLevel != ''">
and t.skip_level= #{skipLevel}
@@ -69,7 +70,7 @@
and t.b_id= #{bId}
</if>
<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ and t.community_id in (#{communityId},'9999')
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -91,7 +92,8 @@
<select id="getWorkflowInfo" parameterType="Map" resultType="Map">
select t.skip_level,t.skip_level skipLevel,t.describle,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id
bId,t.community_id,t.community_id communityId,t.store_id,t.store_id storeId,t.flow_id,t.flow_id
- flowId,t.flow_name,t.flow_name flowName,t.flow_type,t.flow_type flowType,t.create_time createTime,d.name flowTypeName
+ flowId,t.flow_name,t.flow_name flowName,t.flow_type,t.flow_type flowType,t.create_time createTime,d.name flowTypeName,
+ t.process_definition_key,t.process_definition_key processDefinitionKey
from workflow t
left join t_dict d on t.flow_type = d.status_cd and d.table_name = 'workflow' and d.table_columns = 'flow_type'
where 1 =1
@@ -107,8 +109,8 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ <if test="communityId !=null and communityId != '' and operationType==null ">
+ and t.community_id in (#{communityId},'9999')
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -121,6 +123,12 @@
</if>
<if test="flowType !=null and flowType != ''">
and t.flow_type= #{flowType}
+ </if>
+ <if test="flowTypes !=null">
+ and t.flow_type in
+ <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -154,6 +162,9 @@
<if test="flowType !=null and flowType != ''">
, t.flow_type= #{flowType}
</if>
+ <if test="processDefinitionKey !=null and processDefinitionKey != ''">
+ , t.process_definition_key= #{processDefinitionKey}
+ </if>
where 1=1
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -182,7 +193,7 @@
and t.b_id= #{bId}
</if>
<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ and t.community_id in (#{communityId},'9999')
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -197,6 +208,13 @@
and t.flow_type= #{flowType}
</if>
+ <if test="flowTypes !=null">
+ and t.flow_type in
+ <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
</select>
--
Gitblit v1.8.0