From a25d3c16f9f9be1a1b4774402d1907a28dab06fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 09:43:55 +0800
Subject: [PATCH] #核价管理完善

---
 src/main/java/com/zy/crm/manager/controller/PriQuoteController.java |  347 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 319 insertions(+), 28 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 1de6b71..51e0baa 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -1,5 +1,6 @@
 package com.zy.crm.manager.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -11,13 +12,13 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.core.domain.KeyValueVo;
+import com.core.exception.CoolException;
+import com.zy.crm.common.model.SettleDto;
 import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.entity.Item;
-import com.zy.crm.manager.entity.PriQuote;
-import com.zy.crm.manager.entity.PriQuoteBudget;
-import com.zy.crm.manager.service.ItemService;
-import com.zy.crm.manager.service.PriQuoteBudgetService;
-import com.zy.crm.manager.service.PriQuoteService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.UserService;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,15 +38,36 @@
     private PriQuoteService priQuoteService;
 
     @Autowired
-    private ItemService itemService;
+    private PlanService planService;
+
+    @Autowired
+    private UserService userService;
 
     @Autowired
     private PriQuoteBudgetService priQuoteBudgetService;
 
+    @Autowired
+    private ProcessPermissionsService processPermissionsService;
+
+    @Autowired
+    private PlanTypeService planTypeService;
+
     @RequestMapping(value = "/priQuote/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
-        return R.ok(priQuoteService.selectById(String.valueOf(id)));
+        PriQuote priQuote = priQuoteService.selectById(String.valueOf(id));
+        assert priQuote != null;
+        JSONObject resultObj = JSON.parseObject(JSON.toJSONString(priQuote));
+        if (!Cools.isEmpty(priQuote.getForm())) {
+            JSONObject formObj = JSON.parseObject(priQuote.getForm());
+            formObj.forEach(resultObj::putIfAbsent);
+        }
+
+        // 姝ラ鏉$浉鍏�
+        resultObj.put("step", priQuote.getSettle() == 5 ? 0 : priQuote.getSettle() + 1);
+
+        return R.ok().add(resultObj);
+//        return R.ok(priQuoteService.selectById(String.valueOf(id)));
     }
 
     @RequestMapping(value = "/priQuote/list/auth")
@@ -57,7 +79,7 @@
                   @RequestParam(required = false)String condition,
                   @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,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,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,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());
         excludeTrash(param);
         convert(param, wrapper);
@@ -67,20 +89,38 @@
     }
 
     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());
+        }
     }
 
     @RequestMapping(value = "/priQuote/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "娣诲姞鎶ヤ环鍗�")
     public R add(@RequestBody Map<String,Object> map) {
         PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
 
@@ -89,6 +129,7 @@
         priQuote.setTitle(map.get("title").toString());
         priQuote.setTemplateName(priQuoteBudget.getTemplateName());
         priQuote.setSheetData(map.get("sheetData").toString());
+        priQuote.setOriQuoteBudgetId(Long.parseLong(map.get("priQuoteBudgetId").toString()));
         priQuote.setItemId(priQuoteBudget.getItemId());
         priQuote.setOrderNum(priQuoteBudget.getInOrderNum());
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -98,23 +139,35 @@
         priQuote.setUserId(getUserId());
         //鏇存柊浜哄憳
         priQuote.setUpdateUserId(getUserId());
+        //鎵�灞為儴闂�
+        priQuote.setDeptId(getDeptId());
         //鏇存柊鏃堕棿
         priQuote.setUpdateTime(new Date());
+        //妯℃澘
+        priQuote.setTemplate(map.get("template").toString());
 
         //涓氬姟鍛�
-        Item item = itemService.selectById(priQuote.getItemId());
-        priQuote.setMemberId(item.getMember());
+        Plan plan = planService.selectById(priQuote.getItemId());
+        priQuote.setMemberId(plan.getUserId());
 
         //璁剧疆椤圭洰娴佺▼
-        item.setStep(5);
-        itemService.updateById(item);
+        plan.setStep(5);
+
+        priQuote.setForm(JSON.toJSONString(map));     // 鑷畾涔夎〃鍗曞唴瀹�
+        priQuote.setSettle(1);  // 1.寮�濮�
+        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
+        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())));
+
+        planService.updateById(plan);
 
         priQuoteService.insert(priQuote);
         return R.ok();
     }
 
     @RequestMapping(value = "/priQuote/addOther/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鍙﹀瓨鎶ヤ环鍗�")
     public R addOther(@RequestBody Map<String,Object> map) {
         PriQuote quote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
 
@@ -137,15 +190,15 @@
         priQuote.setUpdateTime(new Date());
 
         //涓氬姟鍛�
-        Item item = itemService.selectById(priQuote.getItemId());
-        priQuote.setMemberId(item.getMember());
+        Plan plan = planService.selectById(priQuote.getItemId());
+        priQuote.setMemberId(plan.getUserId());
 
         priQuoteService.insert(priQuote);
         return R.ok();
     }
 
     @RequestMapping(value = "/priQuote/update/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
     public R update(@RequestBody Map<String,Object> map){
         PriQuote priQuote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
         priQuote.setTitle(map.get("title").toString());
@@ -159,7 +212,7 @@
     }
 
     @RequestMapping(value = "/priQuote/updateForm/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
     public R updateForm(Long id,String templateName,String title){
         PriQuote priQuote = priQuoteService.selectById(id);
         priQuote.setTemplateName(templateName);
@@ -173,7 +226,7 @@
     }
 
     @RequestMapping(value = "/priQuote/delete/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "鍒犻櫎鎶ヤ环鍗�")
     public R delete(Long[] ids){
         if (Cools.isEmpty(ids)){
             return R.error();
@@ -236,7 +289,7 @@
         String path =  ClassUtils.getDefaultClassLoader().getResource("excel").getPath();
         String filename = format.format(new Date()) + ".xlsx";
         String filepath = path + "/" + filename;
-        exportLuckySheetXlsx(path,"/" + filename,map.get("exceldata").toString());
+        exportLuckySheetXlsx(path, "/" + filename, map.get("exceldata").toString(), map.get("template").toString());
 
         return R.ok("/priQuote/excel/" + filename);
     }
@@ -268,14 +321,14 @@
         }
     }
 
-    public void exportLuckySheetXlsx(String newFileDir,String newFileName, String excelData) {
+    public void exportLuckySheetXlsx(String newFileDir, String newFileName, String excelData, String template) {
         //瑙f瀽瀵硅薄锛屽彲浠ュ弬鐓у畼鏂规枃妗�:https://mengshukeji.github.io/LuckysheetDocs/zh/guide/#%E6%95%B4%E4%BD%93%E7%BB%93%E6%9E%84
         JSONArray jsonArray = (JSONArray) JSONObject.parse(excelData);
         //濡傛灉鍙湁涓�涓猻heet閭e氨鏄痝et(0),鏈夊涓偅灏卞搴斿彇涓嬫爣
         JSONObject jsonObject = (JSONObject) jsonArray.get(0);
         JSONArray jsonObjectList = jsonObject.getJSONArray("celldata");
         //excel妯℃澘璺緞
-        String filePath =  ClassUtils.getDefaultClassLoader().getResource("excel").getPath() + "/priQuoteTemplate.xlsx";
+        String filePath = ClassUtils.getDefaultClassLoader().getResource("excel").getPath() + "/priQuoteTemplate/data" + template +".xlsx";
 //        String filePath = "/Users/ouyang/Downloads/uploadTestProductFile/鐢熶骇鏃ユ姤琛�.xlsx";
         File file = new File(filePath);
         FileInputStream in = null;
@@ -311,7 +364,7 @@
             }
 
             String value = "";
-            if (jsonObjectValue != null && jsonObjectValue.get("v") != null){
+            if (jsonObjectValue != null && jsonObjectValue.get("v") != null) {
                 //鑾峰彇鍗曞厓鏍煎��
                 value = jsonObjectValue.get("v").toString();
             }
@@ -319,11 +372,11 @@
             if (Integer.parseInt(object.get("r").toString()) >= 4 && Integer.parseInt(object.get("r").toString()) <= 9) {
                 if (Integer.parseInt(object.get("c").toString()) == 2 || Integer.parseInt(object.get("c").toString()) == 6) {
                     //濉厖绗簩鍒楁暟鎹�
-                    if (sheet.getRow((int) object.get("r")) !=null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null){
+                    if (sheet.getRow((int) object.get("r")) != null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null) {
                         if (!value.equals("")) {
                             sheet.getRow((int) object.get("r")).getCell((int) object.get("c")).setCellValue(value);
                         }
-                    }else{
+                    } else {
                         System.out.println("閿欒鐨�=" + index + ">>>" + str_);
                     }
                 }
@@ -343,11 +396,11 @@
                     case 3:
                     case 4:
                     case 5:
-                        if (sheet.getRow((int) object.get("r")) !=null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null){
+                        if (sheet.getRow((int) object.get("r")) != null && sheet.getRow((int) object.get("r")).getCell((int) object.get("c")) != null) {
                             if (!value.equals("")) {
                                 sheet.getRow((int) object.get("r")).getCell((int) object.get("c")).setCellValue(value);
                             }
-                        }else{
+                        } else {
                             System.out.println("閿欒鐨�=" + index + ">>>" + str_);
                         }
                         break;
@@ -374,4 +427,242 @@
         }
     }
 
+    @PostMapping(value = "/priQuote/approval/auth")
+    @ManagerAuth
+    public R approvalPriQuote(@RequestParam Long planId,
+                      @RequestParam(required = false) Long plannerId){
+        PriQuote priQuote = priQuoteService.selectById(planId);
+        assert priQuote != null;
+
+        switch (priQuote.getSettle()) {
+            case 1:
+                // 鏈儴闂ㄧ粡鐞嗗鏍�
+                User user = userService.selectById(priQuote.getUserId());
+                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+                if (manager.getId().equals(getUserId())) {
+
+                    // 淇敼 settle 姝ラ鏁版嵁
+                    List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+                    for (SettleDto dto : list) {
+                        switch (dto.getStep()) {
+                            case 1:
+                                dto.setCurr(Boolean.FALSE);
+                                break;
+                            case 2:
+                                dto.setCurr(Boolean.TRUE);
+                                dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+                                dto.setTime(DateUtils.convert(new Date()));
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    priQuote.setSettleMsg(JSON.toJSONString(list));
+
+                    // 淇敼瑙勫垝鍗曠姸鎬�
+                    priQuote.setSettle(2);  // 鎬昏鍔炲緟瀹�
+                    priQuote.setUpdateUserId(getUserId());
+                    priQuote.setUpdateTime(new Date());
+
+                    if (!priQuoteService.updateById(priQuote)) {
+                        throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�");
+                    }
+
+                } else {
+                    return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+                }
+                break;
+            case 2:
+                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+                User planLeader = userService.selectById(processPermissions.getUserId());       // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
+                if (Cools.isEmpty(planLeader)) {
+                    throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
+                }
+                if (!getUserId().equals(planLeader.getId())) {
+                    return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+                }
+                User planner = userService.selectById(plannerId);
+                // 淇敼 settle 姝ラ鏁版嵁
+                List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+                for (SettleDto dto : list) {
+                    switch (dto.getStep()) {
+                        case 2:
+                            dto.setCurr(Boolean.FALSE);
+                            break;
+                        case 3:
+                            dto.setCurr(Boolean.TRUE);
+                            dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+                            dto.setTime(DateUtils.convert(new Date()));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                priQuote.setSettleMsg(JSON.toJSONString(list));
+                // 淇敼瑙勫垝鍗曠姸鎬�
+                priQuote.setSettle(3);  // 瑙勫垝鍛樺緟瀹�
+                priQuote.setUpdateUserId(getUserId());
+                priQuote.setUpdateTime(new Date());
+
+                if (!priQuoteService.updateById(priQuote)) {
+                    throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�");
+                }
+                break;
+            case 3:
+                // 涓氬姟鍛�
+                User salesman0 = userService.selectById(priQuote.getUserId());
+                if (!getUserId().equals(salesman0.getId())) {
+                    return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+                }
+                // 淇敼 settle 姝ラ鏁版嵁
+                List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+                for (SettleDto dto : list1) {
+                    switch (dto.getStep()) {
+                        case 3:
+                            dto.setCurr(Boolean.TRUE);
+                            break;
+                        case 4:
+                            dto.setCurr(Boolean.TRUE);
+                            dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+                            dto.setTime(DateUtils.convert(new Date()));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                priQuote.setSettleMsg(JSON.toJSONString(list1));
+                // 淇敼瑙勫垝鍗曠姸鎬�
+                priQuote.setSettle(4);  // 瀹℃壒閫氳繃
+                priQuote.setUpdateUserId(getUserId());
+                priQuote.setUpdateTime(new Date());
+
+                if (!priQuoteService.updateById(priQuote)) {
+                    throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�");
+                }
+                break;
+            default:
+                return R.error();
+        }
+        return R.ok("瀹℃壒鎴愬姛");
+    }
+
+    @PostMapping(value = "/priQuote/refuse/auth")
+    @ManagerAuth
+    public R refusePriQuote(@RequestParam Long planId,
+                              @RequestParam(required = false) Long plannerId){
+//        PriQuote priQuote = priQuoteService.selectById(planId);
+//        assert priQuote != null;
+//
+//        switch (priQuote.getSettle()) {
+//            case 1:
+//                // 鏈儴闂ㄧ粡鐞嗗鏍�
+//                User user = userService.selectById(priQuote.getUserId());
+//                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+//                if (manager.getId().equals(getUserId())) {
+//
+//                    // 淇敼 settle 姝ラ鏁版嵁
+//                    List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+//                    for (SettleDto dto : list) {
+//                        switch (dto.getStep()) {
+//                            case 1:
+//                                dto.setCurr(Boolean.FALSE);
+//                                break;
+//                            case 2:
+//                                dto.setCurr(Boolean.TRUE);
+//                                dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+//                                dto.setTime(DateUtils.convert(new Date()));
+//                                break;
+//                            default:
+//                                break;
+//                        }
+//                    }
+//                    priQuote.setSettleMsg(JSON.toJSONString(list));
+//
+//                    // 淇敼瑙勫垝鍗曠姸鎬�
+//                    priQuote.setSettle(2);  // 鎬昏鍔炲緟瀹�
+//                    priQuote.setUpdateUserId(getUserId());
+//                    priQuote.setUpdateTime(new Date());
+//
+//                    if (!priQuoteService.updateById(priQuote)) {
+//                        throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�");
+//                    }
+//
+//                } else {
+//                    return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+//                }
+//                break;
+//            case 2:
+//                ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+//                User planLeader = userService.selectById(processPermissions.getUserId());       // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
+//                if (Cools.isEmpty(planLeader)) {
+//                    throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒");
+//                }
+//                if (!getUserId().equals(planLeader.getId())) {
+//                    return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+//                }
+//                User planner = userService.selectById(plannerId);
+//                // 淇敼 settle 姝ラ鏁版嵁
+//                List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+//                for (SettleDto dto : list) {
+//                    switch (dto.getStep()) {
+//                        case 2:
+//                            dto.setCurr(Boolean.FALSE);
+//                            break;
+//                        case 3:
+//                            dto.setCurr(Boolean.TRUE);
+//                            dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+//                            dto.setTime(DateUtils.convert(new Date()));
+//                            break;
+//                        default:
+//                            break;
+//                    }
+//                }
+//                priQuote.setSettleMsg(JSON.toJSONString(list));
+//                // 淇敼瑙勫垝鍗曠姸鎬�
+//                priQuote.setSettle(3);  // 瑙勫垝鍛樺緟瀹�
+//                priQuote.setUpdateUserId(getUserId());
+//                priQuote.setUpdateTime(new Date());
+//
+//                if (!priQuoteService.updateById(priQuote)) {
+//                    throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�");
+//                }
+//                break;
+//            case 3:
+//                // 涓氬姟鍛�
+//                User salesman0 = userService.selectById(priQuote.getUserId());
+//                if (!getUserId().equals(salesman0.getId())) {
+//                    return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+//                }
+//                // 淇敼 settle 姝ラ鏁版嵁
+//                List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+//                for (SettleDto dto : list1) {
+//                    switch (dto.getStep()) {
+//                        case 3:
+//                            dto.setCurr(Boolean.TRUE);
+//                            break;
+//                        case 4:
+//                            dto.setCurr(Boolean.TRUE);
+//                            dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+//                            dto.setTime(DateUtils.convert(new Date()));
+//                            break;
+//                        default:
+//                            break;
+//                    }
+//                }
+//                priQuote.setSettleMsg(JSON.toJSONString(list1));
+//                // 淇敼瑙勫垝鍗曠姸鎬�
+//                priQuote.setSettle(4);  // 瀹℃壒閫氳繃
+//                priQuote.setUpdateUserId(getUserId());
+//                priQuote.setUpdateTime(new Date());
+//
+//                if (!priQuoteService.updateById(priQuote)) {
+//                    throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�");
+//                }
+//                break;
+//            default:
+//                return R.error();
+//        }
+        return R.ok("瀹℃壒鎴愬姛");
+    }
+
 }

--
Gitblit v1.9.1