From 9f475b23410a0a68fdc76699ff9462253824b476 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 20 六月 2025 17:30:43 +0800
Subject: [PATCH] 维修调度-查询更新
---
src/main/resources/mapper/WorkflowMainMapper.xml | 40 ++++++++++++++++++++--------------------
src/main/java/com/whyc/controller/WorkflowMainController.java | 9 +++++----
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorkflowMainController.java b/src/main/java/com/whyc/controller/WorkflowMainController.java
index 5b15efa..a7a1fe2 100644
--- a/src/main/java/com/whyc/controller/WorkflowMainController.java
+++ b/src/main/java/com/whyc/controller/WorkflowMainController.java
@@ -7,6 +7,7 @@
import com.whyc.service.WorkflowLinkService;
import com.whyc.service.WorkflowMainService;
import com.whyc.util.ActionUtil;
+import com.whyc.util.CommonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,7 @@
@GetMapping("ownStatistics")
@ApiOperation(value = "鏈汉鐨勫崟鎹粺璁�",notes = "status鍚箟:1-瀹℃壒涓�,2-瀹℃壒瀹屾垚涓旈�氳繃,3-瀹℃壒瀹屾垚涓旈┏鍥�")
public Response<Map<Integer,Integer>> getOwnStatistics(int type){
- int userId = ActionUtil.getUser().getId().intValue();
+ int userId = CommonUtil.getUser().getId().intValue();
return service.getOwnStatistics(userId,type);
}
@@ -56,7 +57,7 @@
@GetMapping("ownListPage")
@ApiOperation(value = "鏈汉鐨勫崟鎹垪琛ㄥ垎椤�",notes = "status浼犲弬:0:鍏ㄩ儴,1-瀹℃壒涓�,2-瀹℃壒瀹屾垚涓旈�氳繃,3-瀹℃壒瀹屾垚涓旈┏鍥�")
public Response<PageInfo<WorkflowMain>> ownListPage(int type,int status,int pageNum,int pageSize){
- int userId = ActionUtil.getUser().getId().intValue();
+ int userId = CommonUtil.getUser().getId().intValue();
return service.ownListPage(userId,type,status,pageNum,pageSize);
}
@@ -67,7 +68,7 @@
@GetMapping("receivedStatistics")
@ApiOperation(value = "鎺ユ敹鍒扮殑鍗曟嵁缁熻",notes = "status鍚箟:1-寰呮帴鍗�,6-寰呭鏍�,58-宸插鏍�")
public Response<Map<Integer,Integer>> getReceivedStatistics(int type){
- User user = ActionUtil.getUser();
+ User user = CommonUtil.getUser();
return service.getReceivedStatistics(type,user);
}
@@ -78,7 +79,7 @@
@GetMapping("receivedListPage")
@ApiOperation(value = "鎺ユ敹鍒扮殑鍗曟嵁鍒楄〃鍒嗛〉", notes = "status浼犲弬:0-鍏ㄩ儴,1-寰呮帴鍗�,6-寰呭鏍�,5|8-宸插鏍�(閫氳繃|椹冲洖)")
public Response<PageInfo<WorkflowMain>> getReceivedListPage(int type, int status, int pageNum, int pageSize) {
- User user = ActionUtil.getUser();
+ User user = CommonUtil.getUser();
return service.getReceivedListPage(type, status, user, pageNum, pageSize);
}
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