From 728f68c55b967f05235384c608bd7ca902ac5811 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 19:07:39 +0800
Subject: [PATCH] #关联上下文
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 f6d9471..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;
@@ -39,6 +35,12 @@
@Autowired
private PlanService planService;
+
+ @Autowired
+ private PriSalesService priSalesService;
+
+ @Autowired
+ private CstmrService cstmrService;
@RequestMapping(value = "/priOnline2/{id}/auth")
@ManagerAuth
@@ -111,7 +113,7 @@
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");
@@ -130,6 +132,9 @@
// Item item = itemService.selectById(priOnline.getItemId());
Plan plan = planService.selectById(priOnline2.getItemId());
priOnline2.setMemberId(plan.getUserId());
+
+ Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
+ priOnline2.setTemplateName(cstmr.getName()); //鐢叉柟鍗曚綅鍚嶇О
//璁剧疆椤圭洰娴佺▼
@@ -277,6 +282,12 @@
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