From 44e91f8e7b4c2afd1da950a68a488f4d5451cede Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 23 十一月 2022 13:17:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/PlanController.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 6 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 8a47c4f..85dfa9a 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -1,5 +1,6 @@
 package com.zy.crm.manager.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -14,8 +15,10 @@
 import com.zy.crm.manager.controller.result.FollowerTableVo;
 import com.zy.crm.manager.entity.Plan;
 import com.zy.crm.manager.entity.PlanFoll;
+import com.zy.crm.manager.entity.PlanType;
 import com.zy.crm.manager.service.PlanFollService;
 import com.zy.crm.manager.service.PlanService;
+import com.zy.crm.manager.service.PlanTypeService;
 import com.zy.crm.system.entity.User;
 import com.zy.crm.system.service.UserService;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -38,11 +41,25 @@
 
     @Autowired
     private PlanService planService;
+    @Autowired
+    private PlanTypeService planTypeService;
 
     @GetMapping(value = "/plan/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
-        return R.ok(planService.selectById(String.valueOf(id)));
+        Plan plan = planService.selectById(String.valueOf(id));
+        assert plan != null;
+        JSONObject resultObj = JSON.parseObject(JSON.toJSONString(plan));
+        if (!Cools.isEmpty(plan.getForm())) {
+            JSONObject formObj = JSON.parseObject(plan.getForm());
+            formObj.forEach(resultObj::putIfAbsent);
+        }
+        PlanType planType = planTypeService.selectById(plan.getPlanType());
+        if (planType == null) {
+            return R.error("褰撳墠瑙勫垝鍗曠被鍨嬪凡琚鐢�");
+        }
+        resultObj.put("formHtml", planType.getHtml());
+        return R.ok().add(resultObj);
     }
 
     @RequestMapping(value = "/plan/page/auth")
@@ -60,9 +77,27 @@
         );
     }
 
+    private final List<String> fields = new ArrayList<>();
+
+    {
+        Arrays.asList(Cools.getAllFields(Plan.class)).forEach(item -> {
+            fields.add(item.getName());
+        });
+    }
+
     @RequestMapping(value = "/plan/add/auth")
     @ManagerAuth
-    public R add(Plan plan) {
+    public R add(@RequestParam Map<String, Object> param) {
+        // pre
+        Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
+        Iterator<Map.Entry<String, Object>> iterator = param.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, Object> next = iterator.next();
+            if (this.fields.contains(next.getKey())) {
+                iterator.remove();
+            }
+        }
+        // begin
         Long hostId = getHostId();
         if (planService.selectByUuid(hostId, plan.getUuid()) != null) {
             throw new CoolException("瑙勫垝鍗曞凡瀛樺湪");
@@ -78,19 +113,32 @@
         plan.setUpdateTime(new Date());
         plan.setStatus(1);
 
-        planService.insert(plan);
+        plan.setForm(JSON.toJSONString(param));     // 鑷畾涔夎〃鍗曞唴瀹�
+        plan.setSettle(1);  // 1.寮�濮�
+
+        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));     // 鑷畾涔夎〃鍗曞唴瀹�
+
+        if (!planService.updateById(plan)) {
+            throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+        }
         return R.ok();
     }
 

--
Gitblit v1.9.1