From 391c8925d9375a0d2eed2e1af12d0dc7a6c98d1e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 29 七月 2023 18:15:51 +0800
Subject: [PATCH] #售前规划申请单上传文件
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 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 c3dc7a5..bf7a647 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -14,6 +14,7 @@
import com.core.exception.CoolException;
import com.zy.crm.common.entity.RouteCollectCountType;
import com.zy.crm.common.model.SettleDto;
+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;
@@ -37,6 +38,7 @@
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.*;
@@ -148,44 +150,45 @@
@RequestMapping(value = "/plan/update/auth")
@ManagerAuth
+ @Transactional
public R update(@RequestParam Map<String, Object> param){
- String planNeed = null;
- Integer id = null;
- for (Map.Entry<String, Object> entry : param.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (Cools.isEmpty(val)){
- continue;
- }
- if (entry.getKey().equals("planNeed")){
- planNeed = val;
- }
- if (entry.getKey().equals("id")){
- try{
- id = Integer.parseInt(val);
- }catch (Exception e){
- return R.error();
- }
- }
- }
+// String planNeed = null;
+// Integer id = null;
+// for (Map.Entry<String, Object> entry : param.entrySet()){
+// String val = String.valueOf(entry.getValue());
+// if (Cools.isEmpty(val)){
+// continue;
+// }
+// if (entry.getKey().equals("planNeed")){
+// planNeed = val;
+// }
+// if (entry.getKey().equals("id")){
+// try{
+// id = Integer.parseInt(val);
+// }catch (Exception e){
+// return R.error();
+// }
+// }
+// }
if (Cools.isEmpty(param) || Cools.isEmpty(param.get("id"))){
return R.error();
}
- List<String> planNeedbs = new ArrayList<>(Arrays.asList(planNeed.split("-")));
- if (planNeedbs.get(0).equals("[object Object]")){
- planNeedbs.remove(0);
- Plan plan1 = planService.selectById(id);
- List<String> planNeedas = Arrays.asList(plan1.getPlanNeed().split("-"));
- List<String> routeIntersectionString = SetOfUtils.getRouteIntersectionString(planNeedas, planNeedbs, RouteCollectCountType.DEDUPLICATIONUNION);
- planNeed="";
- for (String planNeedss:routeIntersectionString){
- planNeed=planNeed==""? planNeedss:planNeed + "-" + planNeedss;
- }
- }
+// List<String> planNeedbs = new ArrayList<>(Arrays.asList(planNeed.split("-")));
+// if (planNeedbs.get(0).equals("[object Object]")){
+// planNeedbs.remove(0);
+// Plan plan1 = planService.selectById(id);
+// List<String> planNeedas = Arrays.asList(plan1.getPlanNeed().split("-"));
+// List<String> routeIntersectionString = SetOfUtils.getRouteIntersectionString(planNeedas, planNeedbs, RouteCollectCountType.DEDUPLICATIONUNION);
+// planNeed="";
+// for (String planNeedss:routeIntersectionString){
+// planNeed=planNeed==""? planNeedss:planNeed + "-" + planNeedss;
+// }
+// }
// pre
Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
- plan.setPlanNeed(planNeed);
+// plan.setPlanNeed(planNeed);
param.entrySet().removeIf(next -> this.fields.contains(next.getKey()));
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
@@ -207,6 +210,21 @@
return R.ok();
}
+ @RequestMapping(value = "/plan/insert/file/auth")
+// @ManagerAuth
+ public R insertFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
+ System.out.println("---寮�濮�---");
+ String savePath = "D:/crm/plan/file/"+1+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+ try{
+ FileSaveExampleUtil.saveFile(file, savePath);
+ }catch (Exception e){
+ return R.error();
+ }
+ return R.ok();
+ }
+
+
+
@PostMapping(value = "/plan/approval/auth")
@ManagerAuth
public R approval(@RequestParam Long planId,
--
Gitblit v1.9.1