From f40a9f9c1b90d3efd52926b29f3612cb1c293afa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 13:25:42 +0800
Subject: [PATCH] #跟踪项目负责人默认值
---
src/main/java/com/zy/crm/manager/controller/PriOnlineController.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
index 8333bff..6f155f2 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
@@ -5,18 +5,15 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
-import com.zy.crm.manager.entity.Item;
-import com.zy.crm.manager.entity.Pri;
-import com.zy.crm.manager.entity.PriOnline;
-import com.zy.crm.manager.service.ItemService;
-import com.zy.crm.manager.service.PriOnlineService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.service.PriService;
+import com.zy.crm.system.entity.Role;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils;
@@ -38,7 +35,7 @@
private PriService priService;
@Autowired
- private ItemService itemService;
+ private PlanService planService;
@RequestMapping(value = "/priOnline/{id}/auth")
@ManagerAuth
@@ -65,7 +62,7 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<PriOnline> wrapper = new EntityWrapper<>();
- wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
+ wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
excludeTrash(param);
convert(param, wrapper);
@@ -75,15 +72,33 @@
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ Long deptId = getDeptId();
+ boolean signUserId = false;
+ boolean signDeptId = false;
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ if (entry.getKey().equals("dept_id")){
+ signDeptId = true;
+ }
+ }
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (entry.getKey().equals("dept_id")){
+ if (!val.equals("19")){
+ wrapper.eq(entry.getKey(), val);
+ }
+ } else if (entry.getKey().equals("user_id") && !signDeptId){
+ signUserId = true;
+ wrapper.eq(entry.getKey(), val);
} else {
wrapper.like(entry.getKey(), val);
}
+ }
+ if (!signUserId && !signDeptId){
+ wrapper.eq("user_id", getUserId());
}
}
@@ -106,6 +121,8 @@
priOnline.setOrderNum(format.format(new Date()));
//鍒涘缓浜哄憳
priOnline.setUserId(getUserId());
+ //鍒涘缓浜哄憳閮ㄩ棬
+ priOnline.setDeptId(getDeptId());
//鏇存柊鏃堕棿
priOnline.setUpdateTime(new Date());
//鏇存柊浜哄憳
@@ -113,12 +130,14 @@
//鐘舵�侊紝鏈畬鎴�
priOnline.setStatus(0);
//涓氬姟鍛�
- Item item = itemService.selectById(priOnline.getItemId());
- priOnline.setMemberId(item.getMember());
+// Item item = itemService.selectById(priOnline.getItemId());
+ Plan plan = planService.selectById(priOnline.getItemId());
+ priOnline.setMemberId(plan.getUserId());
+
//璁剧疆椤圭洰娴佺▼
- item.setStep(2);
- itemService.updateById(item);
+ plan.setStep(2);
+ planService.updateById(plan);
priOnlineService.insert(priOnline);
return R.ok();
@@ -146,9 +165,11 @@
priOnline.setUpdateUserId(getUserId());
//鐘舵�侊紝鏈畬鎴�
priOnline.setStatus(0);
+ priOnline.setDeptId(getDeptId());
//涓氬姟鍛�
- Item item = itemService.selectById(priOnline.getItemId());
- priOnline.setMemberId(item.getMember());
+// Item item = itemService.selectById(priOnline.getItemId());
+ Plan plan = planService.selectById(priOnline.getItemId());
+ priOnline.setMemberId(plan.getUserId());
priOnlineService.insert(priOnline);
return R.ok();
@@ -285,7 +306,7 @@
for (PriOnline priOnline : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priOnline.getId());
- map.put("value", priOnline.getOrderNum() + "/" + priOnline.getItemId$() + "/" + priOnline.getMemberId$());
+ map.put("value", priOnline.getOrderNum() + "/" + priOnline.getPlanId$() + "/" + priOnline.getMemberId$());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1