From 1c4935c13c44f35bc59e77cff6a66e3131a35d94 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 27 二月 2025 17:56:21 +0800
Subject: [PATCH] 修改同步
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 145 +++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 86 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
index 22e4080..00118ca 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -22,6 +22,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -56,16 +57,8 @@
private ITjConsumablesService tjConsumablesService;
@Resource
private ISysConfigService configService;
-
- @Resource
- private TjAsyncService asyncService;
-
- @Resource
- private RedisCache redisCache;
-
@Autowired
private IMallKeywordService mallKeywordService;
-
@Autowired
private IMallCategoryService mallCategoryService;
@@ -75,53 +68,12 @@
public TableDataInfo getPacList(@ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
startPage();
List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjPackage aPackage : list) {
-// StringBuilder allProName = new StringBuilder();
-// StringBuilder allSonName = new StringBuilder();
-//
-// List<TjProject> tjProjectList = new ArrayList<>();
-// List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
-// if (null != pplist) {
-// for (TjPackageProject packageProject : pplist) {
-// StringBuilder allSonProName = new StringBuilder(); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-// TjProject tjProject = tjProjectService.getById(packageProject.getProId());
-// if (null != tjProject) {
-// allProName.append(tjProject.getProName()).append("锛�");
-// List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
-//// for (TjProject project : listBySoneId) {
-//// allSonProName.append(project.getProName()).append(";"); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-//// allSonName.append(project.getProName()).append(";");
-//// }
-// tjProject.setAllSonProName(allSonProName.toString()); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-// tjProjectList.add(tjProject);
-// //鐜颁环璧嬪�煎垽鏂璶ull璧嬪師浠� 2023.2.8
-// if (packageProject.getPriceNow() != null) {
-// tjProject.setPriceNow(packageProject.getPriceNow());
-// } else {
-// tjProject.setPriceNow(tjProject.getProPrice());
-// }
-//
-// }
-// }
-// }
-// aPackage.setTjProjectList(tjProjectList);
aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId())));
-// aPackage.setAllSonName(allSonName.toString());
-
-// StringBuffer a = new StringBuffer();
-// List<String> b = new ArrayList<>();
final String keywords = aPackage.getKeywords();
if (keywords != null) {
final String[] strings = keywords.split(",");
-// for (String string : strings) {
-// final MallKeyword byId = mallKeywordService.getById(string);
-// if (byId != null) {
-// a.append(byId.getKeyword());
-// a.append(";");
-// b.add((byId.getId()).toString());
-// }
-// }
aPackage.setKeyNames(mallKeywordService.getKeyNames(strings));
aPackage.setKeyIds(mallKeywordService.getKeyIds(strings));
}
@@ -142,32 +94,19 @@
public AjaxResult getPacInFo(@ApiParam(value = "浣撴濂楅瀵硅薄id") String pacId) {
TjPackage aPackage = tjPackageService.getById(pacId);
if (null != aPackage) {
- List<TjProject> tjProjectList = new ArrayList<>();
List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
if (null != pplist) {
for (TjPackageProject packageProject : pplist) {
-// StringBuilder allSonProName = new StringBuilder(); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
TjProject tjProject = tjProjectService.getById(packageProject.getProId());
if (null != tjProject) {
-// List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
-// for (TjProject project : listBySoneId) {
-// allSonProName.append(project.getProName()).append(";"); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
-// }
- tjProject.setAllSonProName(tjProjectService.getAllSonNames(String.valueOf(packageProject.getProId()))); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
- tjProjectList.add(tjProject);
- //鐜颁环璧嬪�煎垽鏂璶ull璧嬪師浠� 2023.2.8
- if (packageProject.getPriceNow() != null) {
- tjProject.setPriceNow(packageProject.getPriceNow());
- } else {
- tjProject.setPriceNow(tjProject.getProPrice());
- }
-
+ packageProject.setProName(tjProject.getProName());
}
}
}
- aPackage.setTjProjectList(tjProjectList);
+ aPackage.setPackageProjects(pplist);
+ return AjaxResult.success(aPackage);
}
- return AjaxResult.success(aPackage);
+ return AjaxResult.error();
}
@@ -180,7 +119,7 @@
public TableDataInfo list(@ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
startPage();
List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjPackage aPackage : list) {
StringBuilder allProName = new StringBuilder();
StringBuilder allSonName = new StringBuilder();
@@ -436,17 +375,19 @@
BigDecimal money = new BigDecimal("0.00");
tjPackage.setPrice(money);
}
+ tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
if (tjPackageService.save(tjPackage)) {
List<TjProject> tjProjectList = tjPackage.getTjProjectList();
- if (null != tjProjectList && tjProjectList.size() > 0) {
+ if (null != tjProjectList && !tjProjectList.isEmpty()) {
BigDecimal money = new BigDecimal("0.00");
for (TjProject tjProject : tjProjectList) {
TjPackageProject tjpp = new TjPackageProject();
- if (null != tjProject.getPriceNow()) {
- tjpp.setPriceNow(tjProject.getPriceNow().setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
- } else {
- tjpp.setPriceNow(tjProject.getProPrice());
- }
+// if (null != tjProject.getPriceNow()) {
+// tjpp.setPriceNow(tjProject.getPriceNow().setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+// } else {
+// tjpp.setPriceNow(tjProject.getProPrice());
+// }
+ tjpp.setPriceNow(tjProject.getProPrice());
tjpp.setProId(tjProject.getProId());
tjpp.setPacId(tjPackage.getPacId());
//鍒ゆ柇褰撳墠濂楅涓嬫湁娌℃湁杩欎釜椤圭洰 鏈夌殑璇濊烦杩囨坊鍔�
@@ -458,8 +399,8 @@
continue;
}
ppservice.save(tjpp);
- if (null != tjProject.getPriceNow()) {
- money = money.add(tjProject.getPriceNow());
+ if (null != tjProject.getProPrice()) {
+ money = money.add(tjProject.getProPrice());
}
}
tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
@@ -478,25 +419,36 @@
@ApiOperation(value = "淇敼浣撴濂楅")
//@PreAuthorize("@ss.hasPermi('system:package:edit')")
public AjaxResult edit(@RequestBody @ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
+ tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
if (tjPackageService.updateById(tjPackage)) {
List<TjProject> tjProjectList = tjPackage.getTjProjectList();
- if (null != tjProjectList && tjProjectList.size() > 0) {
+ if (null != tjProjectList && !tjProjectList.isEmpty()) {
LambdaQueryWrapper<TjPackageProject> wq = new LambdaQueryWrapper<>();
wq.eq(TjPackageProject::getPacId, tjPackage.getPacId());
ppservice.remove(wq);
BigDecimal money = new BigDecimal(0);
for (TjProject tjProject : tjProjectList) {
- TjPackageProject tjpp = new TjPackageProject();
- if (null != tjProject.getPriceNow()) {
- tjpp.setPriceNow(tjProject.getPriceNow());
- } else {
- tjpp.setPriceNow(new BigDecimal(0).setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+ //鍒ゆ柇褰撳墠濂楅涓嬫湁娌℃湁杩欎釜椤圭洰 鏈夌殑璇濊烦杩囨坊鍔�
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ wqq.eq(TjPackageProject::getProId,tjProject.getProId());
+ final TjPackageProject one = ppservice.getOne(wqq);
+ if (one!=null){
+ continue;
}
+
+ TjPackageProject tjpp = new TjPackageProject();
+// if (null != tjProject.getPriceNow()) {
+// tjpp.setPriceNow(tjProject.getPriceNow());
+// } else {
+// tjpp.setPriceNow(new BigDecimal(0).setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+// }
+ tjpp.setPriceNow(tjProject.getProPrice());
tjpp.setProId(tjProject.getProId());
tjpp.setPacId(tjPackage.getPacId());
ppservice.save(tjpp);
- if (null != tjProject.getPriceNow()) {
- money = money.add(tjProject.getPriceNow());
+ if (null != tjProject.getProPrice()) {
+ money = money.add(tjProject.getProPrice());
}
}
tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
@@ -597,7 +549,7 @@
LambdaQueryWrapper<TjPackage> wq0 = new LambdaQueryWrapper<>();
wq0.like(TjPackage::getPacName, name);
List<TjPackage> packageList = tjPackageService.list(wq0);
- if (null != packageList && packageList.size() > 0) {
+ if (null != packageList && !packageList.isEmpty()) {
for (TjPackage aPackage : packageList) {
List<TjProject> tjProjectList = new ArrayList<>();
LambdaQueryWrapper<TjPackageProject> wq = new LambdaQueryWrapper<>();
@@ -638,7 +590,7 @@
}
List<TjPackage> tjPackageList = tjPackageService.list();
- if (null != tjPackageList && tjPackageList.size() > 0) {
+ if (null != tjPackageList && !tjPackageList.isEmpty()) {
List<TjPackage> lisi = new ArrayList<>();
for (TjPackage aPackage : tjPackageList) {
String pinyin = PinyinUtil.getFirstLetter(aPackage.getPacName(), "");
@@ -686,4 +638,25 @@
}
return AjaxResult.error("璇疯緭鍏ヤ綘瑕佹煡璇㈢殑鍐呭");
}
+
+
+ @PostMapping("/saveOreditTjPacNew")
+ @ApiOperation(value = "浣撴濂楅鏂板淇敼鎺ュ彛")
+ public AjaxResult saveOreditTjPacNew(@RequestBody @ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
+ tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
+ if (tjPackageService.saveOrUpdate(tjPackage)) {
+ List<TjPackageProject> projectList = tjPackage.getPackageProjects();
+ if (null != projectList && !projectList.isEmpty()) {
+ if(StringUtil.isNotBlank(tjPackage.getPacId())){
+ ppservice.deleteTjPackageProjectByPacId(tjPackage.getPacId());
+ for (TjPackageProject project : projectList) {
+ project.setPacId(tjPackage.getPacId());
+ ppservice.save(project);
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
}
--
Gitblit v1.8.0