From 72f84864736d4fb8edde5ccf057b9d15c241dcb6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 16:06:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 caa7561..8bd0658 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -11,6 +11,7 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
+import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.Plan;
@@ -20,6 +21,7 @@
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.DeptService;
import com.zy.crm.system.service.UserService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -43,6 +45,8 @@
private PlanService planService;
@Autowired
private PlanTypeService planTypeService;
+ @Autowired
+ private DeptService deptService;
@GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
@@ -59,6 +63,9 @@
return R.error("褰撳墠瑙勫垝鍗曠被鍨嬪凡琚鐢�");
}
resultObj.put("formHtml", planType.getHtml());
+ // 姝ラ鏉＄浉鍏�
+ resultObj.put("step", plan.getSettle() == 5 ? 0 : plan.getSettle() + 1);
+
return R.ok().add(resultObj);
}
@@ -115,6 +122,8 @@
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
+ User manager = userService.getDeptManager(hostId, getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
if (!planService.insert(plan)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
@@ -135,6 +144,8 @@
plan.setUpdateTime(new Date());
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
+ User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
if (!planService.updateById(plan)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
--
Gitblit v1.9.1