From 8b434a01ef9e2e48d1300be7792caa91f653b08e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 20:04:05 +0800
Subject: [PATCH] #销售核价可查看甲方单位与规划单信息
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index eecca80..6e84943 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -11,12 +11,8 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.entity.Plan;
-import com.zy.crm.manager.entity.Pri;
-import com.zy.crm.manager.entity.PriOnline2;
-import com.zy.crm.manager.service.PlanService;
-import com.zy.crm.manager.service.PriOnline2Service;
-import com.zy.crm.manager.service.PriService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils;
@@ -40,6 +36,12 @@
@Autowired
private PlanService planService;
+ @Autowired
+ private PriSalesService priSalesService;
+
+ @Autowired
+ private CstmrService cstmrService;
+
@RequestMapping(value = "/priOnline2/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -47,7 +49,7 @@
}
@RequestMapping(value = "/priOnline2/viewCheck/{id}/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏌ョ湅璇环")
public R viewCheck(@PathVariable("id") String id) {
PriOnline2 priOnline = priOnline2Service.selectById(String.valueOf(id));
if (Cools.isEmpty(priOnline.getCheckData())) {
@@ -106,12 +108,12 @@
}
@RequestMapping(value = "/priOnline2/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鏍镐环绠＄悊")
public R add(@RequestBody Map<String,Object> map) {
PriOnline2 priOnline2 = new PriOnline2();
priOnline2.setCreateTime(new Date());
priOnline2.setTitle(map.get("title").toString());
- priOnline2.setTemplateName(map.get("title").toString());
+// priOnline2.setTemplateName(map.get("title").toString());
priOnline2.setSheetData(map.get("sheetData").toString());
priOnline2.setItemId(Long.parseLong(map.get("itemId").toString()));
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -131,6 +133,9 @@
Plan plan = planService.selectById(priOnline2.getItemId());
priOnline2.setMemberId(plan.getUserId());
+ Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
+ priOnline2.setTemplateName(cstmr.getName()); //鐢叉柟鍗曚綅鍚嶇О
+
//璁剧疆椤圭洰娴佺▼
plan.setStep(2);
@@ -141,7 +146,7 @@
}
@RequestMapping(value = "/priOnline2/addOther/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍙﹀瓨鏍镐环绠＄悊")
public R addOther(@RequestBody Map<String,Object> map) {
PriOnline2 online = priOnline2Service.selectById(Long.parseLong(map.get("id").toString()));
@@ -173,7 +178,7 @@
}
@RequestMapping(value = "/priOnline2/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鏍镐环绠＄悊")
public R update(@RequestBody Map<String,Object> map){
PriOnline2 priOnline2 = priOnline2Service.selectById(Long.parseLong(map.get("id").toString()));
if (priOnline2.getStatus() == 1) {
@@ -191,7 +196,7 @@
//鏇存柊鐘舵��
@RequestMapping(value = "/priOnline2/updateForm/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鏍镐环绠＄悊鐘舵��")
public R updateForm(Long id,Integer status,String title,String templateName){
PriOnline2 priOnline2 = priOnline2Service.selectById(id);
priOnline2.setStatus(status);
@@ -203,7 +208,7 @@
}
@RequestMapping(value = "/priOnline2/uploadCheck/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "涓婁紶璇环鏂囦欢")
public R uploadCheck(@RequestParam("id") Integer id,
@RequestParam("checkData") String checkData,
@RequestParam("file") MultipartFile[] files){
@@ -272,10 +277,16 @@
}
@RequestMapping(value = "/priOnline2/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鏍镐环绠＄悊")
public R delete(Long[] ids){
if (Cools.isEmpty(ids)){
return R.error();
+ }
+ for (Long id : ids){
+ int priSales = priSalesService.selectCount(new EntityWrapper<PriSales>().eq("pri_online2_id", id));
+ if (priSales!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勪骇鍝佽垂鐢ㄦ槑缁嗭紝绂佹鍒犻櫎锛侊紒锛�");
+ }
}
priOnline2Service.deleteBatchIds(Arrays.asList(ids));
return R.ok();
@@ -303,7 +314,8 @@
for (PriOnline2 priOnline2 : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priOnline2.getId());
- map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getPlanId$() + "/" + priOnline2.getMemberId$());
+// map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getPlanId$() + "/" + priOnline2.getMemberId$());
+ map.put("value", priOnline2.getOrderNum() + "/" + priOnline2.getTemplateName());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1