From e542e0baddf674e406e59a8bb40dd6aa80431f54 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 10:04:39 +0800
Subject: [PATCH] #产品费用明细完善
---
src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
index e1e96c0..d572830 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
@@ -12,12 +12,8 @@
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.entity.Item;
-import com.zy.crm.manager.entity.PriQuoteBudget;
-import com.zy.crm.manager.entity.PriSales;
-import com.zy.crm.manager.service.ItemService;
-import com.zy.crm.manager.service.PriQuoteBudgetService;
-import com.zy.crm.manager.service.PriSalesService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +33,13 @@
private PriQuoteBudgetService priQuoteBudgetService;
@Autowired
- private ItemService itemService;
+ private PlanService planService;
@Autowired
private PriSalesService priSalesService;
+
+ @Autowired
+ private PriQuoteService priQuoteService;
@RequestMapping(value = "/priQuoteBudget/{id}/auth")
@ManagerAuth
@@ -97,7 +96,7 @@
}
@RequestMapping(value = "/priQuoteBudget/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鎶ヤ环棰勭畻鍗�")
public R add(@RequestBody Map<String,Object> map) {
PriSales priSales = priSalesService.selectById(Long.parseLong(map.get("priSalesId").toString()));
@@ -106,6 +105,7 @@
priQuoteBudget.setTitle(map.get("title").toString());
priQuoteBudget.setTemplateName(priSales.getTemplateName());
priQuoteBudget.setSheetData(map.get("sheetData").toString());
+ priQuoteBudget.setPriSalesId(Long.parseLong(map.get("priSalesId").toString()));
priQuoteBudget.setItemId(priSales.getItemId());
//淇濆瓨浜у搧璐圭敤鏄庣粏璁㈠崟鍙�
priQuoteBudget.setOrderNum(priSales.getInOrderNum());
@@ -121,19 +121,19 @@
priQuoteBudget.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priQuoteBudget.getItemId());
- priQuoteBudget.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priQuoteBudget.getItemId());
+ priQuoteBudget.setMemberId(plan.getUserId());
//璁剧疆椤圭洰娴佺▼
- item.setStep(4);
- itemService.updateById(item);
+ plan.setStep(4);
+ planService.updateById(plan);
priQuoteBudgetService.insert(priQuoteBudget);
return R.ok();
}
@RequestMapping(value = "/priQuoteBudget/addOther/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍙﹀瓨鎶ヤ环棰勭畻鍗�")
public R addOther(@RequestBody Map<String,Object> map) {
PriQuoteBudget quote = priQuoteBudgetService.selectById(Long.parseLong(map.get("id").toString()));
@@ -156,15 +156,15 @@
priQuoteBudget.setUpdateTime(new Date());
//涓氬姟鍛�
- Item item = itemService.selectById(priQuoteBudget.getItemId());
- priQuoteBudget.setMemberId(item.getMember());
+ Plan plan = planService.selectById(priQuoteBudget.getItemId());
+ priQuoteBudget.setMemberId(plan.getUserId());
priQuoteBudgetService.insert(priQuoteBudget);
return R.ok();
}
@RequestMapping(value = "/priQuoteBudget/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鎶ヤ环棰勭畻鍗�")
public R update(@RequestBody Map<String,Object> map){
PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("id").toString()));
priQuoteBudget.setTitle(map.get("title").toString());
@@ -178,7 +178,7 @@
}
@RequestMapping(value = "/priQuoteBudget/updateForm/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鎶ヤ环棰勭畻鍗�")
public R updateForm(Long id,String templateName,String title){
PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(id);
priQuoteBudget.setTemplateName(templateName);
@@ -192,10 +192,16 @@
}
@RequestMapping(value = "/priQuoteBudget/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鎶ヤ环棰勭畻鍗�")
public R delete(Long[] ids){
if (Cools.isEmpty(ids)){
return R.error();
+ }
+ for (Long id : ids){
+ int priQuote= priQuoteService.selectCount(new EntityWrapper<PriQuote>().eq("ori_quote_budget_id", id));
+ if (priQuote!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勬姤浠峰崟锛岀姝㈠垹闄わ紒锛侊紒");
+ }
}
priQuoteBudgetService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
@@ -223,7 +229,7 @@
for (PriQuoteBudget priQuoteBudget : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priQuoteBudget.getId());
- map.put("value", priQuoteBudget.getInOrderNum() + "/" + priQuoteBudget.getItemId$() + "/" + priQuoteBudget.getMemberId$());
+ map.put("value", priQuoteBudget.getInOrderNum() + "/" + priQuoteBudget.getPlanId$() + "/" + priQuoteBudget.getMemberId$() + "/" + priQuoteBudget.getTemplateName());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1