From 138dead9b8a35d843a74a799e2cfbe1b12b51189 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 17:46:38 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/resources/mapper/WorkflowMainMapper.xml | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/WorkflowMainMapper.xml b/src/main/resources/mapper/WorkflowMainMapper.xml
index 8c5dced..b065e9e 100644
--- a/src/main/resources/mapper/WorkflowMainMapper.xml
+++ b/src/main/resources/mapper/WorkflowMainMapper.xml
@@ -6,8 +6,8 @@
l.id link_id,
l.main_id,
l.parent_id,
- l.process_level as lProcessLevel,
- l.process_level_name,
+ l.process_stage,
+ l.process_name,
l.create_time link_create_time,
l.deal_user_id,
l.deal_type,
@@ -55,8 +55,8 @@
<id column="link_id" property="id"/>
<result column="main_id" property="mainId"/>
<result column="parent_id" property="parentId"/>
- <result column="lProcessLevel" property="processLevel"/>
- <result column="process_level_name" property="processLevelName"/>
+ <result column="process_stage" property="processStage"/>
+ <result column="process_name" property="processName"/>
<result column="link_create_time" property="createTime"/>
<result column="deal_user_id" property="dealUserId"/>
<result column="deal_type" property="dealType"/>
@@ -83,39 +83,39 @@
<choose>
<!--鍏ㄩ儴-->
<when test="status==0">
- SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
- FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
+ SELECT m.*,u.name as create_user_name,<include refid="linkColumn" />
+ FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user u
where m.id = l.main_id
- and m.create_user_id = u.uId
+ and m.create_user_id = u.id
and m.type = #{type}
- and l.deal_role_id = #{user.uRole}
+ and l.deal_role_id = #{user.role}
and l.deal_user_id is null
union all
- SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
- FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
+ SELECT m.*,u.name as create_user_name,<include refid="linkColumn" />
+ FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user u
where m.id = l.main_id
- and m.create_user_id = u.uId
+ and m.create_user_id = u.id
and m.type = #{type}
- and l.deal_user_id = #{user.uId} order by id desc
+ and l.deal_user_id = #{user.id} order by id desc
</when>
<!--寰呮帴鍗�-->
<when test="status==1">
- SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
- FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
+ SELECT m.*,u.name as create_user_name,<include refid="linkColumn" />
+ FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user u
where m.id = l.main_id
- and m.create_user_id = u.uId
+ and m.create_user_id = u.id
and m.type = #{type}
- and l.deal_role_id = #{user.uRole}
+ and l.deal_role_id = #{user.role}
and l.deal_user_id is null
and l.status = #{status} order by m.id desc
</when>
<otherwise>
- SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
- FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
+ SELECT m.*,u.name as create_user_name,<include refid="linkColumn" />
+ FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user u
where m.id = l.main_id
- and m.create_user_id = u.uId
+ and m.create_user_id = u.id
and m.type = #{type}
- and l.deal_user_id = #{user.uId}
+ and l.deal_user_id = #{user.id}
and l.status = #{status} order by m.id desc
</otherwise>
</choose>
--
Gitblit v1.9.1