From 43c35a69db79277c2110a1bd601ae4d2f728b11b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 23 十一月 2022 11:56:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 3e4d86b..df316ea 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -15,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;
@@ -39,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")
@@ -71,7 +87,7 @@
@RequestMapping(value = "/plan/add/auth")
@ManagerAuth
- public R add0(@RequestParam Map<String, Object> param) {
+ 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();
@@ -101,7 +117,7 @@
plan.setSettle(1); // 1.寮�濮�
planService.insert(plan);
- return R.error();
+ return R.ok();
}
@RequestMapping(value = "/plan/update/auth")
--
Gitblit v1.9.1