From 0e504a7e2d5d7affa0f1ad96c340dbe21f480646 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 26 七月 2023 09:40:21 +0800
Subject: [PATCH] #甲方单位页面优化
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 283 insertions(+), 14 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 6e9f353..859bd71 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -8,16 +8,21 @@
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
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;
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.DeptService;
import com.zy.crm.system.service.UserService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -39,11 +44,30 @@
@Autowired
private PlanService planService;
+ @Autowired
+ private PlanTypeService planTypeService;
+ @Autowired
+ private DeptService deptService;
@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());
+ // 姝ラ鏉＄浉鍏�
+ resultObj.put("step", plan.getSettle() == 5 ? 0 : plan.getSettle() + 1);
+
+ return R.ok().add(resultObj);
}
@RequestMapping(value = "/plan/page/auth")
@@ -71,6 +95,7 @@
@RequestMapping(value = "/plan/add/auth")
@ManagerAuth
+ @Transactional
public R add(@RequestParam Map<String, Object> param) {
// pre
Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
@@ -99,20 +124,41 @@
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
+ User manager = userService.getDeptManager(hostId, getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
- planService.insert(plan);
+ if (!planService.insert(plan)) {
+ throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+ }
+
+ // 鑷姩娣诲姞璺熻繘浜�
+ PlanFoll planFoll = new PlanFoll();
+ planFoll.setPlanId(plan.getId());
+ planFoll.setUserId(manager.getId());
+ if (!planFollService.insert(planFoll)) {
+ 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();
}
@@ -123,6 +169,229 @@
planService.deleteById(id);
}
return R.ok();
+ }
+
+ @PostMapping(value = "/plan/approval/auth")
+ @ManagerAuth
+ public R approval(@RequestParam Long planId,
+ @RequestParam(required = false) Long plannerId){
+ Plan plan = planService.selectById(planId);
+ assert plan != null;
+
+ switch (plan.getSettle()) {
+ case 1:
+ // 鏈粍缁勯暱瀹℃牳
+ User user = userService.selectById(plan.getUserId());
+ User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ if (manager.getId().equals(getUserId())) {
+
+ // 鏌ユ壘瑙勫垝缁勯暱
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ User planLeader = planTypeService.findPlanLeader(planType);
+ if (Cools.isEmpty(planLeader)) {
+ throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list) {
+ switch (dto.getStep()) {
+ case 1:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 2:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("鏈粍缁勯暱" + manager.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ case 3:
+ dto.setUserId(planLeader.getId());
+ dto.setUsername(planLeader.getNickname());
+ break;
+ default:
+ break;
+ }
+ }
+ plan.setSettleMsg(JSON.toJSONString(list));
+
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ plan.setSettle(2); // 瑙勫垝缁勯暱寰呭
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(new Date());
+
+ if (!planService.updateById(plan)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ // 娣诲姞瑙勫垝缁勯暱璺熻繘浜�
+ PlanFoll planFoll = new PlanFoll();
+ planFoll.setPlanId(plan.getId());
+ planFoll.setUserId(planLeader.getId());
+ if (!planFollService.insert(planFoll)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ } else {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ break;
+ case 2:
+ // 鏌ユ壘瑙勫垝缁勯暱
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ User planLeader = planTypeService.findPlanLeader(planType);
+ if (Cools.isEmpty(planLeader)) {
+ throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (Cools.isEmpty(planLeader)) {
+ throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!getUserId().equals(planLeader.getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ if (Cools.isEmpty(plannerId)) {
+ return R.error("鎸囧畾瑙勫垝鍛樹笉鑳戒负绌�");
+ }
+ User planner = userService.selectById(plannerId);
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list) {
+ switch (dto.getStep()) {
+ case 2:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 3:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ case 4:
+ dto.setUserId(planner.getId());
+ dto.setUsername(planner.getNickname());
+ break;
+ default:
+ break;
+ }
+ }
+ plan.setSettleMsg(JSON.toJSONString(list));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ plan.setSettle(3); // 瑙勫垝鍛樺緟瀹�
+ plan.setPlanner(planner.getId());
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(new Date());
+
+ if (!planService.updateById(plan)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ // 娣诲姞瑙勫垝鍛樿窡杩涗汉
+ PlanFoll planFoll = new PlanFoll();
+ planFoll.setPlanId(plan.getId());
+ planFoll.setUserId(planner.getId());
+ if (!planFollService.insert(planFoll)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ case 3:
+ User plannerUser = userService.selectById(plan.getPlanner());
+ if (Cools.isEmpty(plannerUser)) {
+ return R.error("鏈壘鍒拌鍒掑憳");
+ }
+ if (!getUserId().equals(plannerUser.getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ // 涓氬姟鍛�
+ User salesman = userService.selectById(plan.getUserId());
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list0 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list0) {
+ switch (dto.getStep()) {
+ case 3:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 4:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ case 5:
+ dto.setUserId(salesman.getId());
+ dto.setUsername(salesman.getNickname());
+ break;
+ default:
+ break;
+ }
+ }
+ plan.setSettleMsg(JSON.toJSONString(list0));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ plan.setSettle(4); // 瀹℃壒閫氳繃
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(new Date());
+
+ if (!planService.updateById(plan)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ case 4:
+ // 涓氬姟鍛�
+ User salesman0 = userService.selectById(plan.getUserId());
+ if (!getUserId().equals(salesman0.getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list1 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list1) {
+ switch (dto.getStep()) {
+ case 4:
+ dto.setCurr(Boolean.TRUE);
+ break;
+ case 5:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ default:
+ break;
+ }
+ }
+ plan.setSettleMsg(JSON.toJSONString(list1));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ plan.setSettle(5); // 瀹℃壒閫氳繃
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(new Date());
+
+ if (!planService.updateById(plan)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ default:
+ return R.error();
+ }
+ return R.ok("瀹℃壒鎴愬姛");
+ }
+
+ @PostMapping(value = "/plan/planner/list/auth")
+ @ManagerAuth
+ public R plannerList(@RequestParam Long planId){
+ Plan plan = planService.selectById(planId);
+ assert plan != null;
+
+ if (plan.getSettle() != 2) {
+ return R.error();
+ }
+ // 鏌ユ壘瑙勫垝缁勯暱
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ User planLeader = planTypeService.findPlanLeader(planType);
+ if (Cools.isEmpty(planLeader)) {
+ throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!getUserId().equals(planLeader.getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ // 鑾峰彇褰撴湡瑙勫垝缁勬墍鏈夋垚鍛�
+ List<User> users = userService.selectList(new EntityWrapper<User>().eq("dept_id", planLeader.getDeptId()));
+ List<KeyValueVo> vos = new ArrayList<>();
+ users.forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getNickname()), item.getId())));
+ return R.ok().add(vos);
}
@RequestMapping(value = "/planQuery/auth")
@@ -212,8 +481,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());
@@ -228,15 +497,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("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -248,12 +517,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