From 4db25abaa3bca3448aa21b06b82bc614ae397a30 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 10:26:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 88 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 72 insertions(+), 16 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 53e3926..caa7561 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;
- @RequestMapping(value = "/plan/{id}/auth")
+ @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,35 @@
);
}
+ 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("瑙勫垝鍗曞凡瀛樺湪");
+ }
+ plan.setHostId(hostId);
+ plan.setUuid(planService.getUuid(hostId)); // 瑙勫垝鍗曚唬鍙�
+ plan.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ plan.setUserId(getUserId()); // 鎵�灞炰汉鍛�
plan.setCreateBy(getUserId());
plan.setCreateTime(new Date());
@@ -70,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();
}
@@ -182,8 +238,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());
@@ -198,15 +254,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("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -218,12 +274,12 @@
@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("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.1