From 8b109f923dc7c2d5c5bd351a03a5277670962aac Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 04 十二月 2023 13:05:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanUrlController.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanUrlController.java b/src/main/java/com/zy/crm/manager/controller/PlanUrlController.java
index 73fd66c..3c964d5 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanUrlController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanUrlController.java
@@ -46,14 +46,18 @@
@RequestMapping(value = "/plan/url/view/file/auth")
@ManagerAuth
- public R viewFile(@RequestParam("planId") String planId){
+ public R viewFile(@RequestParam("planId") String planId,@RequestParam("planIdI") String planIdI){
List<FileSaveExampleUtil.FileDTO> fileDTOS = new ArrayList<>();
if (Cools.isEmpty(planId)){
return R.ok(fileDTOS);
}
Long id = Long.parseLong(planId);
- Plan plan = planService.selectById(id);
+ Long idPlanIdI = Long.parseLong(planIdI);
+ Plan plan = planService.selectById(idPlanIdI);
PlanType planType = planTypeService.selectById(plan.getPlanType());
+ if (plan.getAssistantHostSign()==1){
+ planType.setType(1);
+ }
// String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
try{
List<PlanUrl> planUrls = planUrlService.selectPlanUrlByPlanId(id,0,planType.getType(),0);
@@ -85,6 +89,9 @@
}else {
status=2;
}
+ if (plan.getAssistantHostSign()==1){
+ planType.setType(1);
+ }
String url = "http://zhongyang-ftpserver.oss-cn-hangzhou.aliyuncs.com/" + filename;
PlanUrl planUrl = new PlanUrl(id, url, filename, filesize,user.getNickname(),user.getId(),1,planType.getType(),status);
planUrlService.insert(planUrl);
@@ -97,20 +104,25 @@
@RequestMapping(value = "/pri/online/url/view/file/auth")
@ManagerAuth
- public R viewFilePriOnline(@RequestParam("planId") String planId){
+ public R viewFilePriOnline(@RequestParam("planId") String planId,@RequestParam("planIdI") String planIdI){
List<FileSaveExampleUtil.FileDTO> fileDTOS = new ArrayList<>();
if (Cools.isEmpty(planId)){
return R.ok(fileDTOS);
}
Long id = Long.parseLong(planId);
+ Long idPlanIdI = Long.parseLong(planIdI);
int planType =0;
- Plan plan = planService.selectById(id);
- if (!plan.getUserId().equals(getUserId())){
- List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
- for (ProcessPermissions processPermissions:processPermissionsList){
- if (getUserId().equals(processPermissions.getUserId())){
- planType=PBN-processPermissions.getProcessMemo();
- break;
+ Plan plan = planService.selectById(idPlanIdI);
+ if (plan.getAssistantHostSign()==1){
+ planType=1;
+ }else {
+ if (!plan.getUserId().equals(getUserId())){
+ List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
+ for (ProcessPermissions processPermissions:processPermissionsList){
+ if (getUserId().equals(processPermissions.getUserId())){
+ planType=PBN-processPermissions.getProcessMemo();
+ break;
+ }
}
}
}
@@ -150,6 +162,9 @@
status=1;
}else {
status=2;
+ }
+ if (plan.getAssistantHostSign()==1){
+ planType.setType(1);
}
String url = "http://zhongyang-ftpserver.oss-cn-hangzhou.aliyuncs.com/" + filename;
PlanUrl planUrl = new PlanUrl(id, url, filename, filesize,user.getNickname(),user.getId(),2,planType.getType(),status);
@@ -201,6 +216,9 @@
}else {
status=2;
}
+ if (plan.getAssistantHostSign()==1){
+ planType.setType(1);
+ }
String url = "http://zhongyang-ftpserver.oss-cn-hangzhou.aliyuncs.com/" + filename;
PlanUrl planUrl = new PlanUrl(id, url, filename, filesize,user.getNickname(),user.getId(),3,planType.getType(),status);
planUrlService.insert(planUrl);
--
Gitblit v1.9.1