From 46d42b0832edb326b262d1c95c64c17bc0784f30 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 15:01:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/PlanController.java |   65 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 13 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 df316ea..9a5169e 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -11,6 +11,7 @@
 import com.core.common.R;
 import com.core.domain.KeyValueVo;
 import com.core.exception.CoolException;
+import com.zy.crm.common.model.SettleDto;
 import com.zy.crm.common.web.BaseController;
 import com.zy.crm.manager.controller.result.FollowerTableVo;
 import com.zy.crm.manager.entity.Plan;
@@ -59,6 +60,9 @@
             return R.error("褰撳墠瑙勫垝鍗曠被鍨嬪凡琚鐢�");
         }
         resultObj.put("formHtml", planType.getHtml());
+        // 姝ラ鏉＄浉鍏�
+        resultObj.put("step", this.getStepOfSettle(plan.getSettle()));
+
         return R.ok().add(resultObj);
     }
 
@@ -115,20 +119,32 @@
 
         plan.setForm(JSON.toJSONString(param));     // 鑷畾涔夎〃鍗曞唴瀹�
         plan.setSettle(1);  // 1.寮�濮�
+        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan)));
 
-        planService.insert(plan);
+        if (!planService.insert(plan)) {
+            throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+        }
         return R.ok();
     }
 
 	@RequestMapping(value = "/plan/update/auth")
 	@ManagerAuth
-    public R update(Plan plan){
-        if (Cools.isEmpty(plan) || null==plan.getId()){
+    public R update(@RequestParam Map<String, Object> param){
+        if (Cools.isEmpty(param) || Cools.isEmpty(param.get("id"))){
             return R.error();
         }
+        // pre
+        Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
+        param.entrySet().removeIf(next -> this.fields.contains(next.getKey()));
         plan.setUpdateBy(getUserId());
         plan.setUpdateTime(new Date());
-        planService.updateById(plan);
+
+        plan.setForm(JSON.toJSONString(param));     // 鑷畾涔夎〃鍗曞唴瀹�
+        plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan)));
+
+        if (!planService.updateById(plan)) {
+            throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+        }
         return R.ok();
     }
 
@@ -228,8 +244,8 @@
 
     @RequestMapping(value = "/plan/followers/table/auth")
     @ManagerAuth
-    public R planFollowersTable(@RequestParam("orderId") Long orderId) {
-        List<PlanFoll> planFolls = planFollService.selectList(new EntityWrapper<PlanFoll>().eq("plan_id", orderId).orderBy("id", false));
+    public R planFollowersTable(@RequestParam("planId") Long planId) {
+        List<PlanFoll> planFolls = planFollService.selectList(new EntityWrapper<PlanFoll>().eq("plan_id", planId).orderBy("id", false));
         List<FollowerTableVo> result = new ArrayList<>();
         for (PlanFoll planFoll : planFolls) {
             User user = userService.selectById(planFoll.getUserId());
@@ -244,15 +260,15 @@
     @RequestMapping(value = "/plan/followers/add/auth")
     @ManagerAuth
     @Transactional
-    public R planFollowersAdd(@RequestParam("orderId") Long orderId,
+    public R planFollowersAdd(@RequestParam("planId") Long planId,
                                @RequestParam("followerIds[]") Long[] followerIds) {
-        if (Cools.isEmpty(orderId, followerIds)) {
+        if (Cools.isEmpty(planId, followerIds)) {
             return R.parse(BaseRes.PARAM);
         }
         for (Long userId : followerIds) {
-            if (planFollService.selectCount(new EntityWrapper<PlanFoll>().eq("plan_id", orderId).eq("user_id", userId)) == 0) {
+            if (planFollService.selectCount(new EntityWrapper<PlanFoll>().eq("plan_id", planId).eq("user_id", userId)) == 0) {
                 PlanFoll planFoll = new PlanFoll();
-                planFoll.setPlanId(orderId);
+                planFoll.setPlanId(planId);
                 planFoll.setUserId(userId);
                 if (!planFollService.insert(planFoll)) {
                     throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -264,15 +280,38 @@
 
     @RequestMapping(value = "/plan/followers/remove/auth")
     @ManagerAuth
-    public R planFollowersRemove(@RequestParam("orderId") Long orderId,
+    public R planFollowersRemove(@RequestParam("planId") Long planId,
                                   @RequestParam("userId") Long userId) {
-        if (Cools.isEmpty(orderId, userId)) {
+        if (Cools.isEmpty(planId, userId)) {
             return R.parse(BaseRes.PARAM);
         }
-        if (!planFollService.delete(new EntityWrapper<PlanFoll>().eq("plan_id", orderId).eq("user_id", userId))) {
+        if (!planFollService.delete(new EntityWrapper<PlanFoll>().eq("plan_id", planId).eq("user_id", userId))) {
             throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
         }
         return R.ok("鍒犻櫎鎴愬姛");
     }
 
+
+
+
+
+
+
+
+    /*************************************** 姝ラ鏉＄浉鍏� **********************************************/
+    private Integer getStepOfSettle(int settle){
+        switch (settle){
+            case 1:
+                return 2;
+            case 2:
+                return 3;
+            case 3:
+                return 4;
+            case 4:
+                return 0;
+            default:
+                return 1;
+        }
+    }
+
 }

--
Gitblit v1.9.1