From 49ab626b5cb89219a4b4b86b5f1774f4705df51c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 15:46:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 320 +++++++++++++++++++++++++---------------------------
1 files changed, 155 insertions(+), 165 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..d65bfb6 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -13,6 +13,7 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
+import com.zy.crm.common.entity.PhoneCodeTypeParam;
import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.*;
@@ -47,10 +48,18 @@
private PriQuoteBudgetService priQuoteBudgetService;
@Autowired
+ private PriOnline2Service priOnline2Service;
+
+ @Autowired
private ProcessPermissionsService processPermissionsService;
@Autowired
private PlanTypeService planTypeService;
+
+ @Autowired
+ private SmsCodeService smsCodeService;
+
+ String PZH = " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
@RequestMapping(value = "/priQuote/{id}/auth")
@ManagerAuth
@@ -72,92 +81,120 @@
@RequestMapping(value = "/priQuote/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @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,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.setSqlSelect("id,title,create_time as createTime,plan_id as planId,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);
allLike(PriQuote.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.or().eq("member_id", getUserId());
+ wrapper.orderBy("update_time", false);
+ wrapper.orderBy("create_time", false);
+ 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();
+ 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")){
+ 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()){
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ 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")){
+ } else if (entry.getKey().equals("dept_id")) {
+ if (!val.equals("19")) {
wrapper.eq(entry.getKey(), val);
}
- } else if (entry.getKey().equals("user_id") && !signDeptId){
+ } 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());
+ if (!signUserId && !signDeptId) {
+ if (getRole().getId() == 1) {
+ wrapper.or().eq("host_id", getHostId());
+ } else if (getRole().getId() == 2) {
+ wrapper.eq("dept_id", getDeptId());
+ } else {
+ wrapper.eq("user_id", getUserId());
+ }
+ }
+ if (signHostId) {
+ wrapper.or().eq("host_id", getHostId());
}
}
@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()));
+ public R add(@RequestBody Map<String, Object> map) {
+// 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()));
- //鍒涘缓浜哄憳
- priQuote.setUserId(getUserId());
+ //涓氬姟鍛�
+ Plan plan = planService.selectById(priQuote.getItemId());
+ User userUp = userService.selectById(plan.getUserId());
+
+ //涓氬姟鍛�
+ priQuote.setUserId(userUp.getId());
//鏇存柊浜哄憳
priQuote.setUpdateUserId(getUserId());
//鎵�灞為儴闂�
- priQuote.setDeptId(getDeptId());
+ priQuote.setDeptId(userUp.getDeptId());
//鏇存柊鏃堕棿
priQuote.setUpdateTime(new Date());
//妯℃澘
priQuote.setTemplate(map.get("template").toString());
- //涓氬姟鍛�
- Plan plan = planService.selectById(priQuote.getItemId());
- priQuote.setMemberId(plan.getUserId());
+ priQuote.setPlanId(priOnline2.getPlanId());
+
//璁剧疆椤圭洰娴佺▼
plan.setStep(5);
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(), userUp.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ } catch (Exception e) {
+ manager = userUp;
+ }
+ priQuote.setMemberId(manager.getId());
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())));
+ priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager, president, getUser())));
planService.updateById(plan);
@@ -167,7 +204,7 @@
@RequestMapping(value = "/priQuote/addOther/auth")
@ManagerAuth(memo = "鍙﹀瓨鎶ヤ环鍗�")
- public R addOther(@RequestBody Map<String,Object> map) {
+ public R addOther(@RequestBody Map<String, Object> map) {
PriQuote quote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
PriQuote priQuote = new PriQuote();
@@ -198,7 +235,7 @@
@RequestMapping(value = "/priQuote/update/auth")
@ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
- public R update(@RequestBody Map<String,Object> map){
+ public R update(@RequestBody Map<String, Object> map) {
PriQuote priQuote = priQuoteService.selectById(Long.parseLong(map.get("id").toString()));
priQuote.setTitle(map.get("title").toString());
priQuote.setSheetData(map.get("sheetData").toString());
@@ -212,7 +249,7 @@
@RequestMapping(value = "/priQuote/updateForm/auth")
@ManagerAuth(memo = "鏇存柊鎶ヤ环鍗�")
- public R updateForm(Long id,String templateName,String title){
+ public R updateForm(Long id, String templateName, String title) {
PriQuote priQuote = priQuoteService.selectById(id);
priQuote.setTemplateName(templateName);
priQuote.setTitle(title);
@@ -226,8 +263,8 @@
@RequestMapping(value = "/priQuote/delete/auth")
@ManagerAuth(memo = "鍒犻櫎鎶ヤ环鍗�")
- public R delete(Long[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Long[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
priQuoteService.deleteBatchIds(Arrays.asList(ids));
@@ -236,7 +273,7 @@
@RequestMapping(value = "/priQuote/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("priOnline"));
@@ -250,10 +287,10 @@
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()){
+ for (PriQuote priQuote : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", priQuote.getId());
map.put("value", priQuote.getId());
@@ -266,7 +303,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<PriQuote> wrapper = new EntityWrapper<PriQuote>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != priQuoteService.selectOne(wrapper)){
+ if (null != priQuoteService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(PriQuote.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -283,9 +320,9 @@
@PostMapping("/priQuote/excel/downfile")
@ManagerAuth
- public R downExcelFile(@RequestBody Map<String,Object> map) {
+ public R downExcelFile(@RequestBody Map<String, Object> map) {
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd_HHmmss");
- String path = ClassUtils.getDefaultClassLoader().getResource("excel").getPath();
+ 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(), map.get("template").toString());
@@ -294,7 +331,7 @@
}
@GetMapping("/priQuote/excel/{path}")
- public void download(@PathVariable String path,HttpServletResponse response) {
+ public void download(@PathVariable String path, HttpServletResponse response) {
try {
ClassPathResource pathResource = new ClassPathResource("excel/" + path);
File file = pathResource.getFile();
@@ -327,7 +364,7 @@
JSONObject jsonObject = (JSONObject) jsonArray.get(0);
JSONArray jsonObjectList = jsonObject.getJSONArray("celldata");
//excel妯℃澘璺緞
- String filePath = ClassUtils.getDefaultClassLoader().getResource("excel").getPath() + "/priQuoteTemplate/data" + template +".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;
@@ -429,7 +466,7 @@
@PostMapping(value = "/priQuote/approval/auth")
@ManagerAuth
public R approvalPriQuote(@RequestParam Long planId,
- @RequestParam(required = false) Long plannerId){
+ @RequestParam(required = false) Long plannerId) {
PriQuote priQuote = priQuoteService.selectById(planId);
assert priQuote != null;
@@ -437,7 +474,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(), user.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ } catch (Exception e) {
+ manager = user;
+ }
if (manager.getId().equals(getUserId())) {
// 淇敼 settle 姝ラ鏁版嵁
@@ -449,7 +491,11 @@
break;
case 2:
dto.setCurr(Boolean.TRUE);
- dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+ if (Cools.isEmpty(dto.getMsg())) {
+ dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+ } else {
+ dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(new Date()) + " " + "閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+ }
dto.setTime(DateUtils.convert(new Date()));
break;
default:
@@ -459,12 +505,18 @@
priQuote.setSettleMsg(JSON.toJSONString(list));
// 淇敼瑙勫垝鍗曠姸鎬�
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+ User planLeader = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
priQuote.setSettle(2); // 鎬昏鍔炲緟瀹�
+ priQuote.setMemberId(planLeader.getId());
priQuote.setUpdateUserId(getUserId());
priQuote.setUpdateTime(new Date());
if (!priQuoteService.updateById(priQuote)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E, getUserId())) {
+ return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
} else {
@@ -490,7 +542,11 @@
break;
case 3:
dto.setCurr(Boolean.TRUE);
- dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ if (Cools.isEmpty(dto.getMsg())) {
+ dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ } else {
+ dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(new Date()) + " " + "鎬荤粡鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ }
dto.setTime(DateUtils.convert(new Date()));
break;
default:
@@ -501,10 +557,15 @@
// 淇敼瑙勫垝鍗曠姸鎬�
priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹�
priQuote.setUpdateUserId(getUserId());
+ priQuote.setMemberId(priQuote.getUserId());
priQuote.setUpdateTime(new Date());
if (!priQuoteService.updateById(priQuote)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ User phoneUser = userService.selectById(priQuote.getUserId());
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E, getUserId())) {
+ return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
break;
case 3:
@@ -522,7 +583,11 @@
break;
case 4:
dto.setCurr(Boolean.TRUE);
- dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ if (Cools.isEmpty(dto.getMsg())) {
+ dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ } else {
+ dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(new Date()) + " " + "涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ }
dto.setTime(DateUtils.convert(new Date()));
break;
default:
@@ -548,120 +613,45 @@
@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("瀹℃壒鎴愬姛");
+ @RequestParam(required = false) Long plannerId) {
+
+ PriQuote priQuote = priQuoteService.selectById(planId);
+
+ Date now = new Date();
+ Long memberId = priQuote.getMemberId();
+ User member = userService.selectById(memberId);
+ if (!member.getId().equals(getUserId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ List<SettleDto> planDtos = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+ List<SettleDto> planDtoList = new ArrayList<>();
+ boolean sign = true;
+ for (SettleDto dto : planDtos) {
+ if (dto.getStep().equals(2)) {
+ priQuote.setMemberId(dto.getUserId());
+ }
+ if (sign && dto.getUserId().equals(memberId) && priQuote.getSettle() + 1 == dto.getStep()) {
+ if (Cools.isEmpty(dto.getMsg())) {
+ dto.setMsg(DateUtils.convert(now) + " " + member.getNickname() + "鍥為��瀹℃壒");
+ } else {
+ dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(now) + " " + member.getNickname() + "鍥為��瀹℃壒");
+ }
+ sign = false;
+ }
+ if (sign) {
+ dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(now) + " " + member.getNickname() + "鍥為��瀹℃壒");
+ }
+
+ planDtoList.add(dto);
+ }
+
+ priQuote.setSettle(1);
+ priQuote.setUpdateUserId(getUserId());
+ priQuote.setUpdateTime(now);
+
+ priQuote.setSettleMsg(JSON.toJSONString(planDtoList));
+ priQuoteService.updateById(priQuote);
+ return R.ok("鍥為��鎴愬姛");
}
}
--
Gitblit v1.9.1