From 237f9af69f9bf1a9ef8cd46e60ec368caa549ae7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 28 十一月 2023 14:17:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 561 ++++++++++++++++++++++++++++---------------------------
1 files changed, 285 insertions(+), 276 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 ecd13fc..f1e3a41 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -6,15 +6,12 @@
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.PhoneCodeTypeParam;
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.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.*;
@@ -78,7 +75,7 @@
}
resultObj.put("formHtml", planType.getHtml());
// 姝ラ鏉＄浉鍏�
- resultObj.put("step", plan.getSettle() == 4 ? 0 : plan.getSettle() + 1);
+ resultObj.put("step", plan.getSettle().equals(plan.getSettleSize()) ? 0 : plan.getSettle() + 1);
return R.ok().add(resultObj);
}
@@ -116,6 +113,23 @@
Arrays.asList(Cools.getAllFields(Plan.class)).forEach(item -> {
fields.add(item.getName());
});
+ }
+
+ @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")
@@ -162,17 +176,43 @@
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
- User manager = new User();
- try{
- manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- }catch (Exception e){
- manager = getUser();
- }
+// 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());
+ // 鑾峰彇涓氬姟鍛�
+ List<String> initNames = new ArrayList<>();
+ initNames.add("鍒涘缓浜嗗鎵�");
+ if (!planType.getFlag().equals("澧炶ˉ")){
+ initNames.add("鍞墠瀹℃牳");
+ initNames.add("瑙勫垝鍛樺鏍�");
+ }
+ initNames.add("涓氬姟鍛樼‘璁�");
+ List<User> users = new ArrayList<>();
+ users.add(getUser());
+ if (!planType.getFlag().equals("澧炶ˉ")){
+ users.add(planLeader);
+ users.add(new User());
+ }
+ users.add(getUser());
+// plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPathTwo(users, initNames, users.size())));
+ plan.setSettleSize(users.size());
+ if (users.size()>1){
+ plan.setDirector(users.get(1).getId());
+ }else {
+ plan.setDirector(getUserId());
+ }
if (!planService.insert(plan)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
@@ -185,8 +225,121 @@
if (!planFollService.insert(planFoll)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
}
-
+ if (users.size()>1 && !users.get(1).getId().equals(getUserId())){
+ if (!smsCodeService.sendSmsCodeText(users.get(1).getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
+ return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
+ }
return R.ok();
+ }
+
+ @RequestMapping(value = "/plan/assistantPlan/add/auth")
+ @ManagerAuth(memo = "娣诲姞鍓鍒掔敵璇峰崟")
+ @Transactional
+ public R assistantPlanAdd(@RequestParam Long hostPlanId) {
+ Plan hostPlan = planService.selectById(hostPlanId);
+ if (!getUserId().equals(hostPlan.getUserId())){
+ return R.error("璇疯仈绯讳笟鍔″憳鎿嶄綔");
+ }
+ 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);
+ // 鑾峰彇涓氬姟鍛�
+ List<String> initNames = new ArrayList<>();
+ initNames.add("鍒涘缓浜嗗鎵�");
+ initNames.add("鍞墠瀹℃牳");
+ initNames.add("瑙勫垝鍛樺鏍�");
+ initNames.add("涓氬姟鍛樼‘璁�");
+ List<User> users = new ArrayList<>();
+ users.add(getUser());
+ users.add(planLeader);
+ users.add(new User());
+ users.add(getUser());
+// plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
+ plan.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPathTwo(users, initNames, users.size())));
+ plan.setSettleSize(users.size());
+ if (users.size()>1){
+ plan.setDirector(users.get(1).getId());
+ }else {
+ plan.setDirector(getUserId());
+ }
+
+ 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("鏇存柊澶辫触锛岃閲嶈瘯");
+ }
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
+ return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
+ return R.ok("淇濆瓨鎴愬姛");
}
@RequestMapping(value = "/plan/update/auth")
@@ -250,33 +403,24 @@
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("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]);
- String url = "http://zhongyang-ftpserver.oss-cn-hangzhou.aliyuncs.com/" + filename;
- planService.increasePlanUrl(id, url, filename, filesize);
- return R.ok();
- } catch (Exception e) {
- System.out.println(e);
- return R.error();
- }
}
private String getFileSuffix(String filename) {
@@ -302,28 +446,6 @@
// }
// return R.ok();
// }
-
- @RequestMapping(value = "/plan/view/file/auth")
-// @ManagerAuth
- public R viewFile(@RequestParam("planId") String planId){
- 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);
- Long size = planService.selectPlanUrlPlanIdSize(id2);
- FileSaveExampleUtil.FileDTO dto = new FileSaveExampleUtil.FileDTO(name,size,url);
- fileDTOS.add(dto);
- }
-// List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
- return R.ok(fileDTOS);
- }catch (Exception e){
- return R.error();
- }
- }
@RequestMapping(value = "/plan/download/file/auth")
// @ManagerAuth
@@ -351,221 +473,88 @@
@RequestParam(required = false) Long plannerId){
Plan plan = planService.selectById(planId);
assert plan != null;
+ User plannerUser = new User();
+ Long nextUserId = getUserId();
+ User director = userService.selectById(plan.getDirector());
- 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:
- // 鏌ユ壘瑙勫垝缁勯暱
- 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("鎸囧畾瑙勫垝鍛樹笉鑳戒负绌�");
- }
- 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 1:
- dto.setCurr(Boolean.FALSE);
- break;
- case 2:
- dto.setCurr(Boolean.TRUE);
- 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 3:
- dto.setUserId(planner.getId());
- dto.setUsername(planner.getNickname());
- break;
- default:
- break;
- }
- }
- plan.setSettleMsg(JSON.toJSONString(list));
- // 淇敼瑙勫垝鍗曠姸鎬�
- 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("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
-
- // 娣诲姞瑙勫垝鍛樿窡杩涗汉
- PlanFoll planFoll = new PlanFoll();
- planFoll.setPlanId(plan.getId());
- planFoll.setUserId(planner.getId());
- if (!planFollService.insert(planFoll)) {
- throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- break;
- case 2:
- 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());
- plan.setDirector(salesman.getId());
-
- // 淇敼 settle 姝ラ鏁版嵁
- List<SettleDto> list0 = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
- for (SettleDto dto : list0) {
- switch (dto.getStep()) {
- case 2:
- dto.setCurr(Boolean.FALSE);
- break;
- case 3:
- dto.setCurr(Boolean.TRUE);
- 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 4:
- dto.setUserId(salesman.getId());
- dto.setUsername(salesman.getNickname());
- break;
- default:
- break;
- }
- }
- plan.setSettleMsg(JSON.toJSONString(list0));
- // 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(3); // 瀹℃壒閫氳繃
- plan.setUpdateBy(getUserId());
- plan.setUpdateTime(new Date());
-
- if (!planService.updateById(plan)) {
- throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- break;
- case 3:
- // 涓氬姟鍛�
- 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 3:
- dto.setCurr(Boolean.TRUE);
- break;
- case 4:
- dto.setCurr(Boolean.TRUE);
- 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:
- break;
- }
- }
- plan.setSettleMsg(JSON.toJSONString(list1));
- // 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(4); // 瀹℃壒閫氳繃
- plan.setStatus(1); // 瀹℃壒閫氳繃
- plan.setUpdateBy(getUserId());
- plan.setUpdateTime(new Date());
-
- if (!planService.updateById(plan)) {
- throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- break;
- default:
- return R.error();
+ if (Cools.isEmpty(getUser()) || Cools.isEmpty(director)){
+ return R.error("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�");
}
+
+ if (!getUserId().equals(director.getId())) {
+ return R.error("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�");
+ }
+
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ // 淇敼 settle 姝ラ鏁版嵁
+ for (SettleDto dto : list) {
+ if (dto.getStep().equals(plan.getSettle())) {
+ dto.setCurr(Boolean.TRUE);
+ } else if (dto.getStep().equals(plan.getSettle()+1)) {
+ dto.setCurr(Boolean.TRUE);
+ if (Cools.isEmpty(dto.getMsg())) {
+ dto.setMsg(director.getNickname() + "瀹℃壒閫氳繃");
+ } else {
+ dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(new Date()) + " " + director.getNickname() + "瀹℃壒閫氳繃");
+ }
+ dto.setTime(DateUtils.convert(new Date()));
+ } else if (dto.getStep().equals(plan.getSettle() + 2)) {
+ if (Cools.isEmpty(dto.getUserId())){
+ if (Cools.isEmpty(plannerId)) {
+ return R.error("鎸囧畾瑙勫垝鍛樹笉鑳戒负绌�");
+ }
+ plannerUser = userService.selectById(plannerId);
+ if (Cools.isEmpty(plannerUser)){
+ return R.error("鏈煡鍒版寚瀹氳鍒掑憳璐﹀彿");
+ }
+ nextUserId= plannerId;
+ plan.setPlanner(plannerId);
+ dto.setUserId(plannerId);
+ dto.setUsername(plannerUser.getNickname());
+ // 娣诲姞瑙勫垝鍛樿窡杩涗汉
+ PlanFoll planFoll = new PlanFoll();
+ planFoll.setPlanId(plan.getId());
+ planFoll.setUserId(nextUserId);
+ if (!planFollService.insert(planFoll)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }else {
+ nextUserId=dto.getUserId();
+ }
+ }
+ }
+ plan.setSettleMsg(JSON.toJSONString(list));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ plan.setSettle(plan.getSettle()+1); // 瀹℃壒閫氳繃
+ if (plan.getSettle().equals(plan.getSettleSize())){
+ plan.setStatus(1);
+ if (plan.getAssistantHostSign()==1){
+ Plan planHost = planService.selectById(plan.getHostPlanId());
+ planHost.setStatus2(1);
+ planService.updateById(planHost);
+ }
+ }
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(new Date());
+ plan.setDirector(nextUserId);
+
+ if (!planService.updateById(plan)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!plan.getSettle().equals(plan.getSettleSize())){
+ if (!Cools.isEmpty(plannerId) && nextUserId.equals(plannerId)){
+ if (!smsCodeService.sendSmsCodeText(plannerUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3,getUserId())) {
+ return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
+ }else {
+ User phoneUser = userService.selectById(nextUserId);
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
+ return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
+ }
+ }
+
return R.ok("瀹℃壒鎴愬姛");
}
@@ -622,6 +611,9 @@
}
// 鏌ユ壘瑙勫垝缁勯暱
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("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
@@ -688,6 +680,7 @@
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;
@@ -716,11 +709,27 @@
List<Map<String, Object>> result = new ArrayList<>();
// for (Plan plan : page.getRecords()){
for (Plan plan : plans){
+ User user = userService.selectById(plan.getUserId());
Map<String, Object> map = new HashMap<>();
map.put("id", plan.getId());
// map.put("value", plan.getName()+"---"+plan.getId());
- map.put("value", plan.getName());
+ map.put("value", plan.getName()+"---"+user.getNickname());
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){
+ User user = userService.selectById(plan.getUserId());
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", plan.getId());
+// map.put("value", plan.getName()+"---"+plan.getId());
+ map.put("value", plan.getName()+"---"+user.getNickname());
+ result.add(map);
+ }
}
return R.ok(result);
}
@@ -750,7 +759,7 @@
* excel瀵煎叆
*/
@PostMapping(value = "/plan/excel/import/auth")
- @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
+ @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆")
// @Transactional
public R planExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
--
Gitblit v1.9.1