From bfb6b1df256df56c7a387682ffdf8feb3897bbb1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 31 八月 2023 10:48:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriSalesController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
index 16c6e53..0b5eccc 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
@@ -13,9 +13,11 @@
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Item;
+import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.PriOnline;
import com.zy.crm.manager.entity.PriSales;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.PlanService;
import com.zy.crm.manager.service.PriOnlineService;
import com.zy.crm.manager.service.PriSalesService;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -40,7 +42,7 @@
private PriOnlineService priOnlineService;
@Autowired
- private ItemService itemService;
+ private PlanService planService;
@RequestMapping(value = "/priSales/{id}/auth")
@ManagerAuth
@@ -67,15 +69,32 @@
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ 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());
}
}
@@ -100,14 +119,15 @@
priSales.setUpdateUserId(getUserId());
//鏇存柊鏃堕棿
priSales.setUpdateTime(new Date());
+ priSales.setDeptId(getDeptId());
//涓氬姟鍛�
- Item item = itemService.selectById(priSales.getItemId());
- priSales.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priSales.getItemId());
+ priSales.setMemberId(plan.getUserId());
//璁剧疆椤圭洰娴佺▼
- item.setStep(3);
- itemService.updateById(item);
+ plan.setStep(3);
+ planService.updateById(plan);
priSalesService.insert(priSales);
return R.ok();
@@ -137,8 +157,8 @@
priSales.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priSales.getItemId());
- priSales.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priSales.getItemId());
+ priSales.setMemberId(plan.getUserId());
priSalesService.insert(priSales);
return R.ok();
@@ -204,7 +224,7 @@
for (PriSales priSales : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priSales.getId());
- map.put("value", priSales.getInOrderNum() + "/" + priSales.getItemId$() + "/" + priSales.getMemberId$());
+ map.put("value", priSales.getInOrderNum() + "/" + priSales.getPlanId$() + "/" + priSales.getMemberId$());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1