From c6e9227208dc46f2f46f046fea0b21bea398a16c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 07 十月 2023 09:40:15 +0800
Subject: [PATCH] #报销相关
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 324 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 226 insertions(+), 98 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 172b69d..c9f790d 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -12,18 +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.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,12 +33,9 @@
import org.springframework.web.multipart.MultipartFile;
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 {
@@ -54,6 +46,14 @@
private PlanTypeService planTypeService;
@Autowired
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
@@ -71,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);
}
@@ -100,7 +100,7 @@
}
@RequestMapping(value = "/plan/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞瑙勫垝鐢宠鍗�")
@Transactional
public R add(@RequestParam Map<String, Object> param) {
// pre
@@ -117,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.setUpdateTime(now);
plan.setStatus(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)));
+ 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("淇濇寔澶辫触锛岃閲嶈瘯");
@@ -140,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("淇濇寔澶辫触锛岃閲嶈瘯");
}
@@ -149,7 +163,7 @@
}
@RequestMapping(value = "/plan/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊瑙勫垝鐢宠鍗�")
@Transactional
public R update(@RequestParam Map<String, Object> param){
// String planNeed = null;
@@ -202,10 +216,14 @@
}
@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("瀛樺湪鍏宠仈鐨勬牳浠峰崟锛岀姝㈠垹闄わ紒锛侊紒");
+ }
+ planService.deleteById(id);
}
return R.ok();
}
@@ -213,86 +231,166 @@
@RequestMapping(value = "/plan/insert/file/auth")
// @ManagerAuth
public R insertFile(@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+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
try{
- FileSaveExampleUtil.saveFile(file, savePath);
+ 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];
+ 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();
+ }*/
+ return R.ok();
+ }catch (Exception e){
+ System.out.println(e);
+ return R.error();
+ }
+ }
+
+ private String getFileSuffix(String filename) {
+ int dotIndex = filename.lastIndexOf(".");
+ if (dotIndex > 0 && dotIndex < filename.length() - 1) {
+ return filename.substring(dotIndex + 1);
+ }
+ 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/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();
}
- return R.ok();
+ }
+
+ @RequestMapping(value = "/plan/download/file/auth")
+// @ManagerAuth
+ public R downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
+// System.out.println("---寮�濮�---");
+// MultipartFile
+ try{
+ String[] names = downloadUrl.split("com/");
+ String name= names[1];
+// ResponseEntity<Resource> resourceResponseEntity = FileSaveExampleUtil.downloadFile(downloadUrl, response);
+// return R.ok(resourceResponseEntity);
+ String download = ossService.download(name);
+ return R.ok().add(download);
+ }catch (Exception e){
+
+ }
+ return R.error();
}
@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 = 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);
@@ -313,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;
@@ -331,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("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -348,7 +451,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
- case 3:
+ case 2:
User plannerUser = userService.selectById(plan.getPlanner());
if (Cools.isEmpty(plannerUser)) {
return R.error("鏈壘鍒拌鍒掑憳");
@@ -362,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;
@@ -380,7 +483,7 @@
}
plan.setSettleMsg(JSON.toJSONString(list0));
// 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(4); // 瀹℃壒閫氳繃
+ plan.setSettle(3); // 瀹℃壒閫氳繃
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
@@ -388,7 +491,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
- case 4:
+ case 3:
// 涓氬姟鍛�
User salesman0 = userService.selectById(plan.getUserId());
if (!getUserId().equals(salesman0.getId())) {
@@ -398,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()));
@@ -412,7 +515,7 @@
}
plan.setSettleMsg(JSON.toJSONString(list1));
// 淇敼瑙勫垝鍗曠姸鎬�
- plan.setSettle(5); // 瀹℃壒閫氳繃
+ plan.setSettle(4); // 瀹℃壒閫氳繃
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
@@ -432,7 +535,7 @@
Plan plan = planService.selectById(planId);
assert plan != null;
- if (plan.getSettle() != 2) {
+ if (plan.getSettle() != 1) {
return R.error();
}
// 鏌ユ壘瑙勫垝缁勯暱
@@ -467,6 +570,31 @@
return R.ok(result);
}
+ @RequestMapping(value = "/planQueryName/auth")
+ @ManagerAuth
+ public R queryName(String condition) {
+ EntityWrapper<Plan> wrapper = new EntityWrapper<>();
+ wrapper.like("name", condition);
+ Long id = getRole().getId();
+ if (id.equals(1L)) {
+ wrapper.eq("host_id", 1);
+ } else if (id.equals(2L)) {
+ wrapper.eq("dept_id", getDeptId());
+ } else {
+ wrapper.eq("user_id", getUserId());
+ }
+ Page<Plan> page = planService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ 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());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
@RequestMapping(value = "/plan/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
--
Gitblit v1.9.1