From caac62f1f080ee8db3aba698f7f67ce105ad9ffe Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 13:30:58 +0800
Subject: [PATCH] #核价相关
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 237 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 142 insertions(+), 95 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 0b45b3d..b980ec9 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -12,20 +12,13 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
-import com.zy.crm.common.entity.RouteCollectCountType;
import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.service.OssService;
import com.zy.crm.common.utils.FileSaveExampleUtil;
-import com.zy.crm.common.utils.SetOfUtils;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
-import com.zy.crm.manager.entity.Order;
-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.manager.entity.*;
+import com.zy.crm.manager.service.*;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
@@ -38,20 +31,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
-
-import static java.util.stream.Collectors.toList;
@RestController
public class PlanController extends BaseController {
@@ -64,6 +48,12 @@
private DeptService deptService;
@Autowired
private OssService ossService;
+ @Autowired
+ private PriOnline2Service priOnline2Service;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private SmsCodeService smsCodeService;
@GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
@@ -81,7 +71,7 @@
}
resultObj.put("formHtml", planType.getHtml());
// 姝ラ鏉＄浉鍏�
- resultObj.put("step", plan.getSettle() == 5 ? 0 : plan.getSettle() + 1);
+ resultObj.put("step", plan.getSettle() == 4 ? 0 : plan.getSettle() + 1);
return R.ok().add(resultObj);
}
@@ -127,21 +117,35 @@
if (planService.selectByUuid(hostId, plan.getUuid()) != null) {
throw new CoolException("瑙勫垝鍗曞凡瀛樺湪");
}
+
+ Order order = orderService.selectById(plan.getOrderId());
+ if (Cools.isEmpty(order)) {
+ throw new CoolException("璺熻釜椤圭洰涓嶅瓨鍦�");
+ }
+
+ if (!order.getDirector().equals(getUserId())){
+ throw new CoolException("鍙厑璁歌窡韪」鐩礋璐ｄ汉娣诲姞鎵�閫夐」鐩鍒掔敵璇峰崟");
+ }
+
+ Date now = new Date();
plan.setHostId(hostId);
plan.setUuid(planService.getUuid(hostId)); // 瑙勫垝鍗曚唬鍙�
plan.setDeptId(getDeptId()); // 鎵�灞為儴闂�
plan.setUserId(getUserId()); // 鎵�灞炰汉鍛�
+ plan.setAppleTime(now);
plan.setCreateBy(getUserId());
- plan.setCreateTime(new Date());
+ plan.setCreateTime(now);
plan.setUpdateBy(getUserId());
- plan.setUpdateTime(new Date());
- plan.setStatus(1);
+ plan.setUpdateTime(now);
+ plan.setStatus(0);
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
User manager = userService.getDeptManager(hostId, getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ User planLeader = planTypeService.findPlanLeader(planType);
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
if (!planService.insert(plan)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
@@ -150,7 +154,7 @@
// 鑷姩娣诲姞璺熻繘浜�
PlanFoll planFoll = new PlanFoll();
planFoll.setPlanId(plan.getId());
- planFoll.setUserId(manager.getId());
+ planFoll.setUserId(planLeader.getId());
if (!planFollService.insert(planFoll)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
}
@@ -215,7 +219,11 @@
@ManagerAuth(memo = "鍒犻櫎瑙勫垝鐢宠鍗�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- planService.deleteById(id);
+ int priOnline2 = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("item_id", id));
+ if (priOnline2!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勬牳浠峰崟锛岀姝㈠垹闄わ紒锛侊紒");
+ }
+ planService.deleteById(id);
}
return R.ok();
}
@@ -326,63 +334,63 @@
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 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);
@@ -403,15 +411,15 @@
List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
for (SettleDto dto : list) {
switch (dto.getStep()) {
- case 2:
+ case 1:
dto.setCurr(Boolean.FALSE);
break;
- case 3:
+ case 2:
dto.setCurr(Boolean.TRUE);
dto.setMsg("鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
dto.setTime(DateUtils.convert(new Date()));
break;
- case 4:
+ case 3:
dto.setUserId(planner.getId());
dto.setUsername(planner.getNickname());
break;
@@ -421,10 +429,15 @@
}
plan.setSettleMsg(JSON.toJSONString(list));
// 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(3); // 瑙勫垝鍛樺緟瀹�
+ plan.setSettle(2); // 瑙勫垝鍛樺緟瀹�
plan.setPlanner(planner.getId());
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
+
+ boolean sendSmsCode = smsCodeService.sendSmsCodeText(planner.getMobile());
+ if (!sendSmsCode) {
+ System.out.println("鐭俊鍙戦�佸け璐ワ紒");
+ }
if (!planService.updateById(plan)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -438,7 +451,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
- case 3:
+ case 2:
User plannerUser = userService.selectById(plan.getPlanner());
if (Cools.isEmpty(plannerUser)) {
return R.error("鏈壘鍒拌鍒掑憳");
@@ -452,15 +465,15 @@
List<SettleDto> list0 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
for (SettleDto dto : list0) {
switch (dto.getStep()) {
- case 3:
+ case 2:
dto.setCurr(Boolean.FALSE);
break;
- case 4:
+ case 3:
dto.setCurr(Boolean.TRUE);
dto.setMsg("瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
dto.setTime(DateUtils.convert(new Date()));
break;
- case 5:
+ case 4:
dto.setUserId(salesman.getId());
dto.setUsername(salesman.getNickname());
break;
@@ -470,7 +483,7 @@
}
plan.setSettleMsg(JSON.toJSONString(list0));
// 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(4); // 瀹℃壒閫氳繃
+ plan.setSettle(3); // 瀹℃壒閫氳繃
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
@@ -478,7 +491,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
- case 4:
+ case 3:
// 涓氬姟鍛�
User salesman0 = userService.selectById(plan.getUserId());
if (!getUserId().equals(salesman0.getId())) {
@@ -488,10 +501,10 @@
List<SettleDto> list1 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
for (SettleDto dto : list1) {
switch (dto.getStep()) {
- case 4:
+ case 3:
dto.setCurr(Boolean.TRUE);
break;
- case 5:
+ case 4:
dto.setCurr(Boolean.TRUE);
dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
dto.setTime(DateUtils.convert(new Date()));
@@ -502,7 +515,8 @@
}
plan.setSettleMsg(JSON.toJSONString(list1));
// 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(5); // 瀹℃壒閫氳繃
+ plan.setSettle(4); // 瀹℃壒閫氳繃
+ plan.setStatus(1); // 瀹℃壒閫氳繃
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
@@ -522,7 +536,7 @@
Plan plan = planService.selectById(planId);
assert plan != null;
- if (plan.getSettle() != 2) {
+ if (plan.getSettle() != 1) {
return R.error();
}
// 鏌ユ壘瑙勫垝缁勯暱
@@ -582,6 +596,39 @@
return R.ok(result);
}
+ @RequestMapping(value = "/planQueryNameToRob/auth")
+ @ManagerAuth
+ public R planQueryNameToRob(String condition) {
+ EntityWrapper<Plan> wrapper = new EntityWrapper<>();
+ wrapper.like("name", condition);
+ wrapper.eq("status",1);
+
+ int type =1;
+ if (getUser().getNickname().equals("鏉庝笘璞�3绾�")){
+ type=2;
+ }
+
+ List<Long> typeList = new ArrayList<>();
+ List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
+ for (PlanType planType : planTypes){
+ typeList.add(planType.getId());
+ }
+ wrapper.in("plan_type",typeList);
+
+// Page<Plan> page = planService.selectPage(new Page<>(0, 10), wrapper);
+ List<Plan> plans = planService.selectList(wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+// for (Plan plan : page.getRecords()){
+ for (Plan plan : plans){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", plan.getId());
+// map.put("value", plan.getName()+"---"+plan.getId());
+ map.put("value", plan.getName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
@RequestMapping(value = "/plan/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
--
Gitblit v1.9.1