From 16bf2151e55c07717bb18a1eb3340aeff18ecf67 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期日, 18 二月 2024 18:04:29 +0800
Subject: [PATCH] zjh 2024/02/18--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 124 ++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 33 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 da0b331..548e140 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
@@ -98,14 +98,6 @@
}
tjProject.setAllSonProName(allSonProName.toString()); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
tjProjectList.add(tjProject);
-// LambdaQueryWrapper<TjProConsumables> wrapper1 = new LambdaQueryWrapper<>();
-// wrapper1.eq(TjProConsumables::getProId, packageProject.getProId());
-// List<TjProConsumables> list0 = tjProConsumablesService.list(wrapper1);
-// List<TjConsumables> list1 = new ArrayList<>();
-// for (TjProConsumables tjProConsumables : list0) {
-// list1.add(tjConsumablesService.getById(tjProConsumables.getConsumablesId()));
-// }
-// tjProject.setConsumablesList(list1);
//鐜颁环璧嬪�煎垽鏂璶ull璧嬪師浠� 2023.2.8
if (packageProject.getPriceNow() != null) {
tjProject.setPriceNow(packageProject.getPriceNow());
@@ -118,7 +110,7 @@
}
aPackage.setTjProjectList(tjProjectList);
aPackage.setAllProName(allProName.toString());
- aPackage.setAllSonName(allSonName.toString());
+// aPackage.setAllSonName(allSonName.toString());
StringBuffer a = new StringBuffer();
List<String> b = new ArrayList<>();
@@ -138,7 +130,7 @@
}
final MallCategory byId = mallCategoryService.getById(aPackage.getCategoryId());
- if (byId!=null){
+ if (byId != null) {
aPackage.setCategoryNames(byId.getName());
}
}
@@ -152,35 +144,93 @@
@GetMapping("getList")
@ApiOperation(value = "鏌ヨ浣撴濂楅鍒楄〃")
public TableDataInfo getList(@RequestParam(required = false) @ApiParam(value = "鎬у埆") String cusSex) {
- List<TjPackage> tjPackageList = null;
- List<TjPackage> list = null;
- if (cusSex == null || cusSex.equals("2")) {
- if (redisCache.hasKey("getTjPackageListBySex")) {
- list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByManAndWoMan");
- } else {
- tjPackageList = tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0));
+// List<TjPackage> tjPackageList = null;
+// List<TjPackage> list = null;
+// if (cusSex == null || cusSex.equals("2")) {
+// if (redisCache.hasKey("getTjPackageListBySex")) {
+// list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByManAndWoMan");
+// } else {
+// tjPackageList = tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0));
+// }
+// } else {
+// if (cusSex.equals("0")) {
+// if (redisCache.hasKey("getTjPackageListBySex")) {
+// list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByMan");
+// } else {
+// tjPackageList = tjPackageService.getTjPackageListByMan();
+// }
+// } else {
+// if (redisCache.hasKey("getTjPackageListBySex")) {
+// list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByWoMan");
+// } else {
+// tjPackageList = tjPackageService.getTjPackageListByWoMan();
+// }
+// }
+// }
+// asyncService.getTjPackageList();
+// if (null != list && list.size() > 0) {
+// return getDataTable(list);
+// } else {
+// getTjPackageList(tjPackageList);
+// return getDataTable(tjPackageList);
+// }
+ String pacName="";
+ if (cusSex==null || cusSex.equals("2")) {
+ final List<TjPackage> pacListBySqlAndAll = tjPackageService.getPacListBySqlAndAll(pacName);
+ if (pacListBySqlAndAll!=null){
+ for (TjPackage tjPackage : pacListBySqlAndAll) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ final List<TjPackageProject> list = ppservice.list(wqq);
+ if (list!=null){
+ for (TjPackageProject tjPackageProject : list) {
+ final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
+ res.add(byId);
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
}
+ return getDataTable(pacListBySqlAndAll);
} else {
if (cusSex.equals("0")) {
- if (redisCache.hasKey("getTjPackageListBySex")) {
- list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByMan");
- } else {
- tjPackageList = tjPackageService.getTjPackageListByMan();
+ final List<TjPackage> pacListBySqlAndMan = tjPackageService.getPacListBySqlAndMan(pacName);
+ if (pacListBySqlAndMan!=null){
+ for (TjPackage tjPackage : pacListBySqlAndMan) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ final List<TjPackageProject> list = ppservice.list(wqq);
+ if (list!=null){
+ for (TjPackageProject tjPackageProject : list) {
+ final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
+ res.add(byId);
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
}
- } else {
- if (redisCache.hasKey("getTjPackageListBySex")) {
- list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByWoMan");
- } else {
- tjPackageList = tjPackageService.getTjPackageListByWoMan();
+ return getDataTable(pacListBySqlAndMan);
+ }else {
+ final List<TjPackage> pacListBySqlAndWomen = tjPackageService.getPacListBySqlAndWomen(pacName);
+ if (pacListBySqlAndWomen!=null){
+ for (TjPackage tjPackage : pacListBySqlAndWomen) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ final List<TjPackageProject> list = ppservice.list(wqq);
+ if (list!=null){
+ for (TjPackageProject tjPackageProject : list) {
+ final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
+ res.add(byId);
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
}
+ return getDataTable(pacListBySqlAndWomen);
}
- }
- asyncService.getTjPackageList();
- if (null != list && list.size() > 0) {
- return getDataTable(list);
- } else {
- getTjPackageList(tjPackageList);
- return getDataTable(tjPackageList);
}
}
@@ -297,6 +347,14 @@
}
tjpp.setProId(tjProject.getProId());
tjpp.setPacId(tjPackage.getPacId());
+ //鍒ゆ柇褰撳墠濂楅涓嬫湁娌℃湁杩欎釜椤圭洰 鏈夌殑璇濊烦杩囨坊鍔�
+ 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;
+ }
ppservice.save(tjpp);
if (null != tjProject.getPriceNow()) {
money = money.add(tjProject.getPriceNow());
--
Gitblit v1.8.0