From bd6c1c1c6642d57c85816a62d77c25c4e1a66a76 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 一月 2024 09:38:46 +0800
Subject: [PATCH] zjh 2024/01/02--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 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 969365e..6dcb844 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
@@ -183,14 +183,61 @@
// return getDataTable(tjPackageList);
// }
String pacName="";
- if (cusSex.equals("2")) {
- return getDataTable(tjPackageService.getPacListBySqlAndAll(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")) {
- return getDataTable(tjPackageService.getPacListBySqlAndMan(pacName));
+ 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);
+ }
+ }
+ }
+ return getDataTable(pacListBySqlAndMan);
}else {
- return getDataTable(tjPackageService.getPacListBySqlAndWomen(pacName));
+ 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);
}
}
}
@@ -308,6 +355,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