From 5528e869fc25354fe62fbb228cfdd40e0df94dbc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 08:32:06 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 13 ++++++
src/main/resources/mapper/PlanMapper.xml | 31 +++++++++++----
src/main/java/com/zy/crm/manager/controller/PlanController.java | 24 +++++++++++-
src/main/resources/mapper/CstmrMapper.xml | 13 ++++++
src/main/resources/application.yml | 10 ++--
5 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 2878b97..45d112f 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -8,6 +8,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
@@ -190,8 +191,27 @@
throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
}
- // 淇敼 settle 姝ラ鏁版嵁 todo
- plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list) {
+ switch (dto.getStep()) {
+ case 1:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 2:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("鏈粍缁勯暱" + manager.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ case 3:
+ dto.setUserId(planLeader.getId());
+ dto.setUsername(planLeader.getNickname());
+ break;
+ default:
+ break;
+ }
+ }
+ plan.setSettleMsg(JSON.toJSONString(list));
// 淇敼瑙勫垝鍗曠姸鎬�
plan.setSettle(2); // 瑙勫垝缁勯暱寰呭
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8e07da0..212dcdc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,12 +9,12 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
-# username: sa
-# password: Zoneyung@zy56$
- url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
+ url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
username: sa
- password: sa@123
+ password: Zoneyung@zy56$
+# url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index 8b08a70..72b1611 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -60,6 +60,19 @@
<choose>
<when test="deptId != null and deptId != ''">
AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ or
+ (
+ user_id = #{userId}
+ or
+ mc.id in
+ (
+ select
+ cstmr_id
+ from man_cstmr_foll
+ where 1=1
+ and user_id = #{userId}
+ )
+ )
</when>
<otherwise>
and
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 55e8538..92140e8 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -57,6 +57,19 @@
<choose>
<when test="deptId != null and deptId != ''">
AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ or
+ (
+ user_id = #{userId}
+ or
+ mo.id in
+ (
+ select
+ order_id
+ from man_order_foll
+ where 1=1
+ and user_id = #{userId}
+ )
+ )
</when>
<otherwise>
and
diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index b21aedf..6915a1e 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -64,19 +64,32 @@
<choose>
<when test="deptId != null and deptId != ''">
AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ or
+ (
+ user_id = #{userId}
+ or
+ mp.id in
+ (
+ select
+ plan_id
+ from man_plan_foll
+ where 1=1
+ and user_id = #{userId}
+ )
+ )
</when>
<otherwise>
and
(
- user_id = #{userId}
- or
- mp.id in
- (
- select
- plan_id
- from man_plan_foll
- where 1=1
- and user_id = #{userId}
+ user_id = #{userId}
+ or
+ mp.id in
+ (
+ select
+ plan_id
+ from man_plan_foll
+ where 1=1
+ and user_id = #{userId}
)
)
</otherwise>
--
Gitblit v1.9.1