From 5bdba4f712b203db5acdd981922a5bc1706b29ff Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 19:15:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 e8aadad..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,14 +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.Plan;
-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.PlanService;
-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;
@@ -43,6 +37,9 @@
@Autowired
private PriSalesService priSalesService;
+
+ @Autowired
+ private PriQuoteService priQuoteService;
@RequestMapping(value = "/priQuoteBudget/{id}/auth")
@ManagerAuth
@@ -108,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());
@@ -199,6 +197,12 @@
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();
}
@@ -225,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.getPlanId$() + "/" + priQuoteBudget.getMemberId$());
+ map.put("value", priQuoteBudget.getInOrderNum() + "/" + priQuoteBudget.getPlanId$() + "/" + priQuoteBudget.getMemberId$() + "/" + priQuoteBudget.getTemplateName());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1