From 6630484f4d595c468dba6b07d4586bfbb16525fa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 17:14:19 +0800
Subject: [PATCH] #合同审核完善
---
src/main/java/com/zy/crm/manager/controller/PriSalesController.java | 144 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 142 insertions(+), 2 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 32880ae..8c33ab4 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriSalesController.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,9 +12,13 @@
import com.core.common.Cools;
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.*;
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;
@@ -41,10 +46,18 @@
@Autowired
private PriQuoteBudgetService priQuoteBudgetService;
+ @Autowired
+ private UserService userService;
+
@RequestMapping(value = "/priSales/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(priSalesService.selectById(String.valueOf(id)));
+ PriSales priSales = priSalesService.selectById(String.valueOf(id));
+ assert priSales != null;
+ JSONObject resultObj = JSON.parseObject(JSON.toJSONString(priSales));
+ // 姝ラ鏉＄浉鍏�
+ resultObj.put("step", priSales.getSettle() == 4 ? 0 : priSales.getSettle() + 1);
+ return R.ok().add(resultObj);
}
@RequestMapping(value = "/priSales/list/auth")
@@ -56,7 +69,7 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<PriSales> 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,settle,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.in("member_id", getUserRoleBelongsToUserId("allopen"));
excludeTrash(param);
convert(param, wrapper);
@@ -122,6 +135,16 @@
//涓氬姟鍛�
Plan plan = planService.selectById(priSales.getItemId());
priSales.setMemberId(plan.getUserId());
+
+ priSales.setSettle(0);
+
+ User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ List<String> initNames = new ArrayList<>();
+ initNames.add("鍒涘缓浜у搧璐圭敤鏄庣粏妯℃澘");
+ initNames.add("鎻愪氦浜у搧璐圭敤鏄庣粏");
+ initNames.add("閮ㄩ棬缁忕悊瀹℃牳");
+ initNames.add("涓氬姟鍛樼‘璁�");
+ priSales.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
//璁剧疆椤圭洰娴佺▼
plan.setStep(3);
@@ -415,4 +438,121 @@
}
}
+
+ @PostMapping(value = "/priSales/approval/auth")
+ @ManagerAuth
+ public R approvalBusinessTrip(@RequestParam Long priSalesId,
+ @RequestParam(required = false) Long plannerId){
+ PriSales priSales = priSalesService.selectById(priSalesId);
+ assert priSales != null;
+ Date now = new Date();
+ switch (priSales.getSettle()) {
+ case 0:
+ User user2 = userService.selectById(priSales.getUserId());
+ User manager1 = userService.getDeptManager(getHostId(), user2.getDeptId());
+
+ if (Cools.isEmpty(getUser())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+ }
+ if (!getUserId().equals(getUser().getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+ }
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list1 = JSON.parseArray(priSales.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list1) {
+ switch (dto.getStep()) {
+ case 0:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 1:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg(getUser().getNickname() + "鎻愪氦瀹屾垚");
+ dto.setTime(DateUtils.convert(now));
+ break;
+ default:
+ break;
+ }
+ }
+ priSales.setSettleMsg(JSON.toJSONString(list1));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priSales.setSettle(1);
+ priSales.setUpdateUserId(getUserId());
+ priSales.setUpdateTime(now);
+ priSales.setMemberId(manager1.getId());
+
+ if (!priSalesService.updateById(priSales)) {
+ throw new CoolException("鎻愪氦澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ case 1:
+ // 鏈儴闂ㄧ粡鐞嗗鏍�
+ User user = userService.selectById(priSales.getUserId());
+ User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ if (manager.getId().equals(getUserId())) {
+
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(priSales.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(now));
+ break;
+ default:
+ break;
+ }
+ }
+ priSales.setSettleMsg(JSON.toJSONString(list));
+
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priSales.setSettle(2); // 鐢宠閫氳繃
+ priSales.setUpdateTime(now);
+ if (!priSalesService.updateById(priSales)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ } else {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄愶紒锛侊紒");
+ }
+ break;
+ case 2:
+ // 涓氬姟鍛�
+ User salesman0 = userService.selectById(priSales.getUserId());
+ if (!getUserId().equals(salesman0.getId())) {
+ return R.error("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�");
+ }
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list2 = JSON.parseArray(priSales.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list2) {
+ switch (dto.getStep()) {
+ case 2:
+ dto.setCurr(Boolean.TRUE);
+ break;
+ case 3:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "浠ョ‘璁�");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ default:
+ break;
+ }
+ }
+ priSales.setSettleMsg(JSON.toJSONString(list2));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ priSales.setSettle(3); // 瀹℃壒閫氳繃
+ priSales.setUpdateTime(new Date());
+
+ if (!priSalesService.updateById(priSales)) {
+ throw new CoolException("纭澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
+ default:
+ return R.error();
+ }
+ return R.ok("瀹℃壒鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1