From b8f192b2657c11a0345652c735e457acf27fb0f3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 22 十一月 2022 15:23:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/PlanController.java |   26 ++++++++++++++++++++++++--
 src/main/webapp/static/js/plan/plan.js                          |    3 +++
 2 files changed, 27 insertions(+), 2 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..3e4d86b 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;
@@ -60,9 +61,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 add0(@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,8 +97,11 @@
         plan.setUpdateTime(new Date());
         plan.setStatus(1);
 
+        plan.setForm(JSON.toJSONString(param));     // 鑷畾涔夎〃鍗曞唴瀹�
+        plan.setSettle(1);  // 1.寮�濮�
+
         planService.insert(plan);
-        return R.ok();
+        return R.error();
     }
 
 	@RequestMapping(value = "/plan/update/auth")
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 68db138..38a8f60 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -255,6 +255,9 @@
                                                         data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
                                                         data.field.userId = userSel.getValue()[0] ? userSel.getValue()[0].value : null;
                                                         data.field.planNeed = planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null;
+
+                                                        delete data.field.select;delete data.field.planTypeName;
+
                                                         if (!data.field.orderId) {
                                                             layer.msg("璺熻釜椤圭洰涓嶈兘涓虹┖", {icon: 2});
                                                             top.requireTip($('#orderXmlSel'));

--
Gitblit v1.9.1