From 96bea93e9591de5bd6e632b7bf9bb1e920f371ed Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 十一月 2023 15:04:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 587 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 438 insertions(+), 149 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 89c6475..4e77bb0 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -6,26 +6,16 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
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.common.*;
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 +28,12 @@
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 javax.xml.crypto.Data;
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 +46,18 @@
private DeptService deptService;
@Autowired
private OssService ossService;
+ @Autowired
+ private PriOnline2Service priOnline2Service;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private SmsCodeService smsCodeService;
+ @Autowired
+ private ProcessPermissionsService processPermissionsService;
+
+ String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
+ Integer PBN = 6;
+
@GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
@@ -81,7 +75,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);
}
@@ -93,10 +87,22 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
@RequestParam(required = false, value = "user_id") Long userId) {
+ Long director = null;
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ director = getUserId();
+ }
+
return R.ok(planService.getPage(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , userId
+ , director
, condition)
);
}
@@ -109,8 +115,25 @@
});
}
+ @RequestMapping(value = "/plan/assistantPlan/view/auth")
+ @ManagerAuth(memo = "鏌ョ湅鍓鍒掔敵璇峰崟")
+ @Transactional
+ public R assistantPlanView(@RequestParam Long hostPlanId) {
+ Plan plan = planService.selectById(hostPlanId);
+ if (plan.getAssistantHostSign()==1){
+ EntityWrapper<Plan> wrapper = new EntityWrapper<>();
+ wrapper.eq("id",plan.getHostPlanId());
+ Page<Plan> planPage = planService.selectPage(new Page<>(1, 1), wrapper);
+ return R.ok(planPage);
+ }
+ EntityWrapper<Plan> wrapper = new EntityWrapper<>();
+ wrapper.eq("id",plan.getAssistantPlanId());
+ Page<Plan> planPage = planService.selectPage(new Page<>(1, 1), wrapper);
+ return R.ok(planPage);
+ }
+
@RequestMapping(value = "/plan/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞瑙勫垝鐢宠鍗�")
@Transactional
public R add(@RequestParam Map<String, Object> param) {
// pre
@@ -127,21 +150,48 @@
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.setStep(1);
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
- User manager = userService.getDeptManager(hostId, getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = getUser();
+ }
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ if (planType.getType().equals(2)) {
+ plan.setStatus2(0);
+ }else {
+ plan.setStatus2(10);
+ }
+ User planLeader = planTypeService.findPlanLeader(planType);
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
+
+ plan.setDirector(planLeader.getId());
if (!planService.insert(plan)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
@@ -150,7 +200,7 @@
// 鑷姩娣诲姞璺熻繘浜�
PlanFoll planFoll = new PlanFoll();
planFoll.setPlanId(plan.getId());
- planFoll.setUserId(manager.getId());
+ planFoll.setUserId(planLeader.getId());
if (!planFollService.insert(planFoll)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
}
@@ -158,8 +208,93 @@
return R.ok();
}
+ @RequestMapping(value = "/plan/assistantPlan/add/auth")
+ @ManagerAuth(memo = "娣诲姞鍓鍒掔敵璇峰崟")
+ @Transactional
+ public R assistantPlanAdd(@RequestParam Long hostPlanId) {
+ Plan hostPlan = planService.selectById(hostPlanId);
+ if (hostPlan.getAssistantHostSign()!=0){
+ return R.error("姝よ鍒掑崟涓嶉渶瑕佸垱寤哄壇娴佺▼");
+ }
+ PlanType planType2 = planTypeService.selectById(hostPlan.getPlanType());
+ if (planType2.getType()!=2){
+ return R.error("姝よ鍒掑崟涓嶉渶瑕佸垱寤哄壇娴佺▼");
+ }
+ if (!Cools.isEmpty(hostPlan.getAssistantPlanId()) && hostPlan.getAssistantPlanId()!=0){
+ return R.error("姝よ鍒掑崟宸插瓨鍦ㄥ壇瑙勫垝鍗曪紝id涓�"+hostPlan.getAssistantPlanId());
+ }
+ // pre
+ Plan plan = new Plan(hostPlan);
+ // begin
+ Long hostId = getHostId();
+ 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(now);
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(now);
+ plan.setStatus(0);
+ plan.setStatus2(0);
+ plan.setStep(1);
+ plan.setSettle(1); // 1.寮�濮�
+ plan.setAssistantHostSign(1);//鍓鍒掑崟
+
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = getUser();
+ }
+ PlanType planType = new PlanType(hostPlan.getHostId(),1);//1:璐ф灦
+ User planLeader = planTypeService.findPlanLeader(planType);
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
+
+ plan.setDirector(planLeader.getId());
+
+ if (!planService.insert(plan)) {
+ throw new CoolException("淇濆瓨澶辫触锛岃閲嶈瘯");
+ }
+ plan.setAssistantPlanId(plan.getId());
+ plan.setHostPlanId(hostPlanId);
+ 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("淇濆瓨澶辫触锛岃閲嶈瘯");
+ }
+
+ hostPlan.setAssistantPlanId(plan.getId());
+ hostPlan.setHostPlanId(hostPlanId);
+ if (!planService.updateById(hostPlan)) {
+ throw new CoolException("鏇存柊澶辫触锛岃閲嶈瘯");
+ }
+ return R.ok("淇濆瓨鎴愬姛");
+ }
+
@RequestMapping(value = "/plan/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊瑙勫垝鐢宠鍗�")
@Transactional
public R update(@RequestParam Map<String, Object> param){
// String planNeed = null;
@@ -212,41 +347,52 @@
}
@RequestMapping(value = "/plan/delete/auth")
- @ManagerAuth
+ @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("瀛樺湪鍏宠仈鐨勬牳浠峰崟锛岀姝㈠垹闄わ紒锛侊紒");
+ }
+ Plan planA = planService.selectById(id);
+ if (planA.getAssistantHostSign()==1){
+ Plan planB = planService.selectById(planA.getHostPlanId());
+ planB.setAssistantPlanId(0L);
+ planB.setHostPlanId(0L);
+ planB.setStatus2(0);
+ planService.updateById(planB);
+ }else {
+ if (!Cools.isEmpty(planA.getAssistantPlanId()) && planA.getAssistantPlanId()!=0){
+ Plan planB = planService.selectById(planA.getAssistantPlanId());
+ if (!Cools.isEmpty(planB)){
+ return R.error("瀛樺湪鍏宠仈鐨勫壇瑙勫垝鍗曪紝绂佹鍒犻櫎锛侊紒锛� 鍓鍒掑崟ID锛�"+planB.getId());
+ }
+ }
+ }
+ planService.deleteById(id);
}
return R.ok();
}
@RequestMapping(value = "/plan/insert/file/auth")
// @ManagerAuth
- public R insertFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
- try{
- InputStream inputStream = file.getInputStream();
- // 鑾峰彇鏂囦欢鐨勫唴瀹圭被鍨�
- String contentType = file.getContentType();
- String suffix = getFileSuffix(file.getOriginalFilename());
- String url = ossService.upload(inputStream, suffix,contentType);
-// String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
- String[] names = url.split("com/");
- String name= names[1];
+ public R insertFile(@RequestParam("planId") String planId, @RequestParam("filename") String filename, @RequestParam("filesize") Long filesize) {
+ try {
+// InputStream inputStream = file.getInputStream();
+// // 鑾峰彇鏂囦欢鐨勫唴瀹圭被鍨�
+// String contentType = file.getContentType();
+// String url = ossService.upload(inputStream, file.getOriginalFilename(), contentType);
+//// String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
+// String[] names = url.split("com/");
+// String name= names[1];
+
+
String[] split = planId.split("-");
int id = Integer.parseInt(split[1]);
- planService.increasePlanUrl(id,url,name,file.getSize());
-
- /*String[] split = planId.split("-");
- int id = Integer.parseInt(split[1]);
- System.out.println("---寮�濮�---");
- String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
- try{
- FileSaveExampleUtil.saveFile(file, savePath);
- }catch (Exception e){
- return R.error();
- }*/
+ String url = "http://zhongyang-ftpserver.oss-cn-hangzhou.aliyuncs.com/" + filename;
+ planService.increasePlanUrl(id, url, filename, filesize);
return R.ok();
- }catch (Exception e){
+ } catch (Exception e) {
System.out.println(e);
return R.error();
}
@@ -260,30 +406,33 @@
return "";
}
- @RequestMapping(value = "/plan/delete/file/auth")
-// @ManagerAuth
- public R deleteFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
- planId="涓婁紶鏂囦欢-20";
- String[] split = planId.split("-");
- int id = Integer.parseInt(split[1]);
- System.out.println("---寮�濮�---");
- String savePath = "D:/crm/plan/file/"+id+"/"+file.getName(); // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
- try{
- FileSaveExampleUtil.deleteFilesInDirectory(savePath);
- }catch (Exception e){
- return R.error();
- }
- return R.ok();
- }
+// @RequestMapping(value = "/plan/delete/file/auth")
+//// @ManagerAuth
+// public R deleteFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
+// planId="涓婁紶鏂囦欢-20";
+// String[] split = planId.split("-");
+// int id = Integer.parseInt(split[1]);
+// System.out.println("---寮�濮�---");
+// String savePath = "D:/crm/plan/file/"+id+"/"+file.getName(); // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+// try{
+// FileSaveExampleUtil.deleteFilesInDirectory(savePath);
+// }catch (Exception e){
+// return R.error();
+// }
+// return R.ok();
+// }
@RequestMapping(value = "/plan/view/file/auth")
// @ManagerAuth
public R viewFile(@RequestParam("planId") String planId){
+ List<FileSaveExampleUtil.FileDTO> fileDTOS = new ArrayList<>();
+ if (Cools.isEmpty(planId)){
+ return R.ok(fileDTOS);
+ }
int id = Integer.parseInt(planId);
// String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
try{
List<Integer> ids = planService.selectPlanUrlId(id);
- List<FileSaveExampleUtil.FileDTO> fileDTOS = new ArrayList<>();
for (int id2 : ids){
String url = planService.selectPlanUrlPlanIdUrl(id2);
String name = planService.selectPlanUrlPlanIdName(id2);
@@ -319,73 +468,77 @@
@PostMapping(value = "/plan/approval/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀹℃壒鐢宠鍗�")
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 = new User();
+// try{
+// manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+// }catch (Exception e){
+// manager = user;
+// }
+// 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);
+ User planLeader = userService.selectById(plan.getDirector());
if (Cools.isEmpty(planLeader)) {
throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
}
@@ -398,20 +551,25 @@
if (Cools.isEmpty(plannerId)) {
return R.error("鎸囧畾瑙勫垝鍛樹笉鑳戒负绌�");
}
+ plan.setDirector(plannerId);
User planner = userService.selectById(plannerId);
// 淇敼 settle 姝ラ鏁版嵁
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() + "瀹℃壒閫氳繃");
+ if (Cools.isEmpty(dto.getMsg())){
+ dto.setMsg("鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ }else {
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ }
dto.setTime(DateUtils.convert(new Date()));
break;
- case 4:
+ case 3:
dto.setUserId(planner.getId());
dto.setUsername(planner.getNickname());
break;
@@ -421,10 +579,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 +601,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
- case 3:
+ case 2:
User plannerUser = userService.selectById(plan.getPlanner());
if (Cools.isEmpty(plannerUser)) {
return R.error("鏈壘鍒拌鍒掑憳");
@@ -448,19 +611,25 @@
}
// 涓氬姟鍛�
User salesman = userService.selectById(plan.getUserId());
+ plan.setDirector(salesman.getId());
+
// 淇敼 settle 姝ラ鏁版嵁
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() + "瀹℃壒閫氳繃");
+ if (Cools.isEmpty(dto.getMsg())){
+ dto.setMsg("瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
+ }else {
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
+ }
dto.setTime(DateUtils.convert(new Date()));
break;
- case 5:
+ case 4:
dto.setUserId(salesman.getId());
dto.setUsername(salesman.getNickname());
break;
@@ -470,7 +639,7 @@
}
plan.setSettleMsg(JSON.toJSONString(list0));
// 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(4); // 瀹℃壒閫氳繃
+ plan.setSettle(3); // 瀹℃壒閫氳繃
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
@@ -478,7 +647,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
- case 4:
+ case 3:
// 涓氬姟鍛�
User salesman0 = userService.selectById(plan.getUserId());
if (!getUserId().equals(salesman0.getId())) {
@@ -488,12 +657,16 @@
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() + "瀹℃壒閫氳繃");
+ if (Cools.isEmpty(dto.getMsg())){
+ dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ }else {
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ }
dto.setTime(DateUtils.convert(new Date()));
break;
default:
@@ -502,9 +675,16 @@
}
plan.setSettleMsg(JSON.toJSONString(list1));
// 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(5); // 瀹℃壒閫氳繃
+ plan.setSettle(4); // 瀹℃壒閫氳繃
+ plan.setStatus(1); // 瀹℃壒閫氳繃
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
+
+ if (plan.getAssistantHostSign()==1){
+ Plan planHost = planService.selectById(plan.getHostPlanId());
+ planHost.setStatus2(1);
+ planService.updateById(planHost);
+ }
if (!planService.updateById(plan)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -516,17 +696,62 @@
return R.ok("瀹℃壒鎴愬姛");
}
+ @PostMapping(value = "/plan/approvalEnd/auth")
+ @ManagerAuth(memo = "鎷掔粷鐢宠鍗�")
+ public R approvalEnd(@RequestParam Long planId,
+ @RequestParam(required = false) Long plannerId) {
+ Plan plan = planService.selectById(planId);
+ Date now = new Date();
+ Long directorId = plan.getDirector();
+ User director = userService.selectById(directorId);
+ if (!director.getId().equals(getUserId())){
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ List<SettleDto> planDtos = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ List<SettleDto> planDtoList = new ArrayList<>();
+ boolean sign = true;
+ for (SettleDto dto : planDtos) {
+ if (dto.getStep().equals(2)){
+ plan.setDirector(dto.getUserId());
+ }
+ if (sign && dto.getUserId().equals(directorId) && plan.getSettle()+1==dto.getStep()){
+ if (Cools.isEmpty(dto.getMsg())){
+ dto.setMsg(DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
+ }else {
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
+ }
+ sign = false;
+ }
+ if (sign){
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
+ }
+
+ planDtoList.add(dto);
+ }
+ plan.setStatus(0);
+ plan.setStep(1);
+ plan.setSettle(1);
+ plan.setSettleMsg(JSON.toJSONString(planDtoList));
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(now);
+ planService.updateById(plan);
+ 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) {
+ if (plan.getSettle() != 1) {
return R.error();
}
// 鏌ユ壘瑙勫垝缁勯暱
PlanType planType = planTypeService.selectById(plan.getPlanType());
+ if (plan.getAssistantHostSign()==1){
+ planType.setType(1);
+ }
User planLeader = planTypeService.findPlanLeader(planType);
if (Cools.isEmpty(planLeader)) {
throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
@@ -538,6 +763,11 @@
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())));
+ if (planType.getType().equals(2)){
+ ProcessPermissions processPermissions= processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 101).eq("process", "1-1"));//2锛氭牳浠锋祦绋�
+ User manager = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+ vos.add(new KeyValueVo(String.valueOf(manager.getNickname()), manager.getId()));
+ }
return R.ok().add(vos);
}
@@ -575,12 +805,71 @@
for (Plan plan : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", plan.getId());
- map.put("value", plan.getName()+"---"+plan.getId());
+// map.put("value", plan.getName()+"---"+plan.getId());
+ map.put("value", plan.getName());
result.add(map);
}
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);
+ wrapper.eq("assistant_host_sign",0);
+
+ List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
+ int type =0;
+ for (ProcessPermissions processPermissions:processPermissionsList){
+ if (getUserId().equals(processPermissions.getUserId())){
+ type=PBN-processPermissions.getProcessMemo();
+ break;
+ }
+ }
+ if (type==0){
+ return R.error("浣犱笉鏄牳浠峰憳,鏃犳潈鎺ヤ换鍔�");
+ }
+
+ List<Long> typeList = new ArrayList<>();
+ List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
+ if (Cools.isEmpty(planTypes) || planTypes.size()==0){
+ return R.ok();
+ }
+ 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);
+ }
+ if (type==1){
+ EntityWrapper<Plan> wrapper2 = new EntityWrapper<>();
+ wrapper2.like("name", condition);
+ wrapper2.eq("status",1);
+ wrapper2.eq("assistant_host_sign",1);
+ List<Plan> plan2s = planService.selectList(wrapper2);
+ for (Plan plan : plan2s){
+ 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