From 064e2b95e2a88f9679a1834e4dec95038c0482ff Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 15:31:34 +0800
Subject: [PATCH] #流程相关

---
 src/main/java/com/zy/crm/manager/controller/PriQuoteController.java |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index 3e15a2a..039af1f 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -47,6 +47,9 @@
     private PriQuoteBudgetService priQuoteBudgetService;
 
     @Autowired
+    private PriOnline2Service priOnline2Service;
+
+    @Autowired
     private ProcessPermissionsService processPermissionsService;
 
     @Autowired
@@ -80,21 +83,25 @@
                   @RequestParam Map<String, Object> param){
         EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
         wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId,template");
-        wrapper.in("member_id", getUserRoleBelongsToUserId());
+//        wrapper.in("member_id", getUserRoleBelongsToUserId());
         excludeTrash(param);
         convert(param, wrapper);
         allLike(PriQuote.class, param.keySet(), wrapper, condition);
+        wrapper.or().eq("member_id",getUserId());
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         return R.ok(priQuoteService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
-        Long deptId = getDeptId();
         boolean signUserId = false;
         boolean signDeptId = false;
+        boolean signHostId = false;
         for (Map.Entry<String, Object> entry : map.entrySet()){
             if (entry.getKey().equals("dept_id")){
                 signDeptId = true;
+                if (String.valueOf(entry.getValue()).equals("19")){
+                    signHostId = true;
+                }
             }
         }
         for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -117,20 +124,25 @@
         if (!signUserId && !signDeptId){
             wrapper.eq("user_id", getUserId());
         }
+        if (signHostId){
+            wrapper.or().eq("host_id",1);
+        }
     }
 
     @RequestMapping(value = "/priQuote/add/auth")
     @ManagerAuth(memo = "娣诲姞鎶ヤ环鍗�")
     public R add(@RequestBody Map<String,Object> map) {
-        PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+//        PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+        PriOnline2 priOnline2 = priOnline2Service.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
 
         PriQuote priQuote = new PriQuote();
         priQuote.setCreateTime(new Date());
         priQuote.setTitle(map.get("title").toString());
-        priQuote.setTemplateName(priQuoteBudget.getTemplateName());
+        priQuote.setTemplateName(priOnline2.getTemplateName());
         priQuote.setSheetData(map.get("sheetData").toString());
-        priQuote.setItemId(priQuoteBudget.getItemId());
-        priQuote.setOrderNum(priQuoteBudget.getInOrderNum());
+        priQuote.setPriOnlineId(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+        priQuote.setItemId(priOnline2.getItemId());
+        priQuote.setOrderNum(priOnline2.getOrderNum());
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
         priQuote.setInOrderNum(format.format(new Date()));
 
@@ -154,7 +166,12 @@
 
         priQuote.setForm(JSON.toJSONString(map));     // 鑷畾涔夎〃鍗曞唴瀹�
         priQuote.setSettle(1);  // 1.寮�濮�
-        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
+        User manager = new User();
+        try{
+            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
+        }catch (Exception e){
+            manager = getUser();
+        }
         ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
         User president = userService.selectById(processPermissions.getUserId());       // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3-1纭浜�
         priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager,president,getUser())));
@@ -250,7 +267,7 @@
     public R query(String condition) {
         EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
         wrapper.like("id", condition);
-        wrapper.in("member_id", getUserRoleBelongsToUserId());
+        wrapper.in("user_id", getUserRoleBelongsToUserId());
         Page<PriQuote> page = priQuoteService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (PriQuote priQuote : page.getRecords()){
@@ -437,7 +454,12 @@
             case 1:
                 // 鏈儴闂ㄧ粡鐞嗗鏍�
                 User user = userService.selectById(priQuote.getUserId());
-                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+                User manager = new User();
+                try{
+                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
+                }catch (Exception e){
+                    manager = user;
+                }
                 if (manager.getId().equals(getUserId())) {
 
                     // 淇敼 settle 姝ラ鏁版嵁

--
Gitblit v1.9.1