From e85439da9f2fb1be90509a72e637613a5c0bbc11 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 09 十一月 2023 12:08:18 +0800
Subject: [PATCH] #副PLAN
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 160 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 119 insertions(+), 41 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 5a40c57..cae4711 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -59,6 +59,7 @@
private ProcessPermissionsService processPermissionsService;
String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
+ Integer PBN = 6;
@GetMapping(value = "/plan/{id}/auth")
@@ -188,6 +189,84 @@
return R.ok();
}
+ @RequestMapping(value = "/plan/assistantPlan/add/auth")
+ @ManagerAuth(memo = "娣诲姞鍓鍒掔敵璇峰崟")
+ @Transactional
+ public R assistantPlanAdd(@RequestParam Long hostPlanId) {
+ Plan hostPlan = planService.selectById(hostPlanId);
+ 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(memo = "鏇存柊瑙勫垝鐢宠鍗�")
@Transactional
@@ -249,6 +328,20 @@
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);
+ 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();
@@ -256,31 +349,23 @@
@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();
}
@@ -313,11 +398,14 @@
@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);
@@ -696,30 +784,20 @@
wrapper.like("name", condition);
wrapper.eq("status",1);
-
- ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-1"));//2锛氭牳浠锋祦绋�
- User manager1 = userService.selectById(processPermissions1.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
-
- ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-2"));//2锛氭牳浠锋祦绋�
- User manager2 = userService.selectById(processPermissions2.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
-
- ProcessPermissions processPermissions3= processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-3"));//2锛氭牳浠锋祦绋�
- User manager3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
-
+ List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
int type =0;
- if (getUserId().equals(manager1.getId())){
- type=1;//(璐ф灦)
- }else if (getUserId().equals(manager2.getId()) || getUserId().equals(manager3.getId())){
- type = 2;//(闆嗘垚)
- }else {
+ 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 (type==1){
- planTypes = planTypeService.selectList(new EntityWrapper<PlanType>());
- }
if (Cools.isEmpty(planTypes) || planTypes.size()==0){
return R.ok();
}
--
Gitblit v1.9.1