From 03d3cd458fc0dee8859564073ae3e754df228e2f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 十一月 2023 14:17:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 16d7faa..04612bb 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.*;
@@ -55,6 +56,9 @@
@Autowired
private PlanTypeService planTypeService;
+ @Autowired
+ private SmsCodeService smsCodeService;
+
String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
@RequestMapping(value = "/priQuote/{id}/auth")
@@ -84,7 +88,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,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.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);
@@ -124,7 +128,13 @@
}
}
if (!signUserId && !signDeptId){
- wrapper.eq("user_id", getUserId());
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",1);
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
}
if (signHostId){
wrapper.or().eq("host_id",1);
@@ -162,6 +172,8 @@
priQuote.setUpdateTime(new Date());
//妯℃澘
priQuote.setTemplate(map.get("template").toString());
+
+ priQuote.setPlanId(priOnline2.getPlanId());
@@ -500,6 +512,9 @@
if (!priQuoteService.updateById(priQuote)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
} else {
return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
@@ -527,7 +542,7 @@
if (Cools.isEmpty(dto.getMsg())){
dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
}else {
- dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"鎬荤粡鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
}
dto.setTime(DateUtils.convert(new Date()));
break;
@@ -545,6 +560,10 @@
if (!priQuoteService.updateById(priQuote)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+ User phoneUser = userService.selectById(priQuote.getUserId());
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
break;
case 3:
// 涓氬姟鍛�
--
Gitblit v1.9.1