From c3e3fe6694ca5b9050a58c411a2193a9c50f7900 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 13:17:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
index c0c447a..e8aadad 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.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.PriQuoteBudget;
 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.PriQuoteBudgetService;
 import com.zy.crm.manager.service.PriSalesService;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -37,7 +39,7 @@
     private PriQuoteBudgetService priQuoteBudgetService;
 
     @Autowired
-    private ItemService itemService;
+    private PlanService planService;
 
     @Autowired
     private PriSalesService priSalesService;
@@ -67,20 +69,37 @@
     }
 
     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());
+        }
     }
 
     @RequestMapping(value = "/priQuoteBudget/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "娣诲姞鎶ヤ环棰勭畻鍗�")
     public R add(@RequestBody Map<String,Object> map) {
         PriSales priSales = priSalesService.selectById(Long.parseLong(map.get("priSalesId").toString()));
 
@@ -97,25 +116,26 @@
 
         //鍒涘缓浜哄憳
         priQuoteBudget.setUserId(getUserId());
+        priQuoteBudget.setDeptId(getDeptId());
         //鏇存柊浜哄憳
         priQuoteBudget.setUpdateUserId(getUserId());
         //鏇存柊鏃堕棿
         priQuoteBudget.setUpdateTime(new Date());
 
         //涓氬姟鍛�
-        Item item = itemService.selectById(priQuoteBudget.getItemId());
-        priQuoteBudget.setMemberId(item.getMember());
+        Plan plan = planService.selectById(priQuoteBudget.getItemId());
+        priQuoteBudget.setMemberId(plan.getUserId());
 
         //璁剧疆椤圭洰娴佺▼
-        item.setStep(4);
-        itemService.updateById(item);
+        plan.setStep(4);
+        planService.updateById(plan);
 
         priQuoteBudgetService.insert(priQuoteBudget);
         return R.ok();
     }
 
     @RequestMapping(value = "/priQuoteBudget/addOther/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鍙﹀瓨鎶ヤ环棰勭畻鍗�")
     public R addOther(@RequestBody Map<String,Object> map) {
         PriQuoteBudget quote = priQuoteBudgetService.selectById(Long.parseLong(map.get("id").toString()));
 
@@ -138,15 +158,15 @@
         priQuoteBudget.setUpdateTime(new Date());
 
         //涓氬姟鍛�
-        Item item = itemService.selectById(priQuoteBudget.getItemId());
-        priQuoteBudget.setMemberId(item.getMember());
+        Plan plan = planService.selectById(priQuoteBudget.getItemId());
+        priQuoteBudget.setMemberId(plan.getUserId());
 
         priQuoteBudgetService.insert(priQuoteBudget);
         return R.ok();
     }
 
     @RequestMapping(value = "/priQuoteBudget/update/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鏇存柊鎶ヤ环棰勭畻鍗�")
     public R update(@RequestBody Map<String,Object> map){
         PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("id").toString()));
         priQuoteBudget.setTitle(map.get("title").toString());
@@ -160,7 +180,7 @@
     }
 
     @RequestMapping(value = "/priQuoteBudget/updateForm/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鏇存柊鎶ヤ环棰勭畻鍗�")
     public R updateForm(Long id,String templateName,String title){
         PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(id);
         priQuoteBudget.setTemplateName(templateName);
@@ -174,7 +194,7 @@
     }
 
     @RequestMapping(value = "/priQuoteBudget/delete/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鍒犻櫎鎶ヤ环棰勭畻鍗�")
     public R delete(Long[] ids){
         if (Cools.isEmpty(ids)){
             return R.error();
@@ -205,7 +225,7 @@
         for (PriQuoteBudget priQuoteBudget : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
             map.put("id", priQuoteBudget.getId());
-            map.put("value", priQuoteBudget.getInOrderNum() + "/" + priQuoteBudget.getItemId$() + "/" + priQuoteBudget.getMemberId$());
+            map.put("value", priQuoteBudget.getInOrderNum() + "/" + priQuoteBudget.getPlanId$() + "/" + priQuoteBudget.getMemberId$());
             result.add(map);
         }
         return R.ok(result);

--
Gitblit v1.9.1