From 308589effc0fe60876a5794571ede0c211cc828c Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 10 一月 2025 17:25:09 +0800 Subject: [PATCH] zjh20250110 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 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 fae6ec7..9c7ef7e 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 @@ -94,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(); } -- Gitblit v1.8.0