From 16d0d58f36ab5dd862d1858f9fd84c7b8d9a74bd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 23 十一月 2022 11:14:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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..df316ea 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,6 +113,9 @@
plan.setUpdateTime(new Date());
plan.setStatus(1);
+ plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
+ plan.setSettle(1); // 1.寮�濮�
+
planService.insert(plan);
return R.ok();
}
--
Gitblit v1.9.1