From b3ca67f50de0dd141c29283533dd553aaec26154 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 02 十一月 2023 12:57:43 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 14 ++++++++------
src/main/resources/mapper/PlanMapper.xml | 6 +++---
src/main/java/com/zy/crm/manager/mapper/OrderMapper.java | 2 +-
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 4 ++--
src/main/java/com/zy/crm/manager/service/OrderService.java | 2 +-
src/main/java/com/zy/crm/manager/controller/OrderController.java | 4 ++++
6 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index d513a35..5b2bebd 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -65,6 +65,7 @@
status = Integer.parseInt(param.get("status").toString());
}
+ Long director = null;
if (deptId==null && userId == null){
if (getRole().getId()==3){
userId = getUserId();
@@ -72,12 +73,14 @@
deptId = getDeptId();
userId = null;
}
+ director = getUserId();
}
return R.ok(orderService.getPage(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId
+ , director
, condition
, status)
);
@@ -364,6 +367,7 @@
, getHostId()
, role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
+ , null
, condition
, 0);
List<KeyValueVo> vos = new ArrayList<>();
diff --git a/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java b/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
index ac40808..db4d412 100644
--- a/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
@@ -18,7 +18,7 @@
Order selectOrderByNewestUuid(@Param("hostId") Long hostId);
- List<Order> listByPage(Page<Order> page, @Param("hostId") Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId, @Param("condition") String condition, @Param("status") Integer status);
+ List<Order> listByPage(Page<Order> page, @Param("hostId") Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId,@Param("director") Long director, @Param("condition") String condition, @Param("status") Integer status);
Double selectMoneyByYearAndStatus(String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�讳氦鏄撻噾棰�
diff --git a/src/main/java/com/zy/crm/manager/service/OrderService.java b/src/main/java/com/zy/crm/manager/service/OrderService.java
index 3f917c9..9d2b150 100644
--- a/src/main/java/com/zy/crm/manager/service/OrderService.java
+++ b/src/main/java/com/zy/crm/manager/service/OrderService.java
@@ -14,7 +14,7 @@
String getUuid(Long hostId);
- Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status);
+ Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId,Long director, String condition, Integer status);
Double selectMoneyByYearAndStatus(String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�讳氦鏄撻噾棰�
diff --git a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
index addf494..f9a0459 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
@@ -21,8 +21,8 @@
}
@Override
- public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status) {
- return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition, status));
+ public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, Long director, String condition, Integer status) {
+ return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId,director, condition, status));
}
@Override
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 0c5d82f..1f8c3b4 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -62,7 +62,7 @@
AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
or
(
- user_id = #{userId}
+ mo.user_id = #{userId}
or
mo.id in
(
@@ -78,12 +78,11 @@
and
(
<if test="userId != null and userId != ''">
- user_id = #{userId}
+ mo.user_id = #{userId}
+ or
+ mo.director = #{userId}
+ or
</if>
- <if test="userId == null or userId == ''">
- user_id is not null
- </if>
- or
mo.id in
(
select
@@ -109,6 +108,9 @@
or mo.addr like concat('%',#{condition},'%')
)
</if>
+ <if test="director != null and director != ''">
+ or mo.director = #{director}
+ </if>
ORDER BY mo.create_time DESC
</select>
diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index a8713e2..0d63880 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -68,7 +68,7 @@
AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
or
(
- user_id = #{userId}
+ mp.user_id = #{userId}
or
mp.id in
(
@@ -84,9 +84,9 @@
and
(
<if test="userId != null and userId != ''">
- user_id = #{userId}
+ mp.user_id = #{userId}
or
- director = #{userId}
+ mp.director = #{userId}
or
</if>
mp.id in
--
Gitblit v1.9.1