From a6ae7c44fccca62e535c763aae0e599d2f3f73b0 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 29 五月 2024 14:27:53 +0800
Subject: [PATCH] 增加通过多个base64PDF合并为一个
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 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 548e140..8fec6a9 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
@@ -69,6 +69,67 @@
@Autowired
private IMallCategoryService mallCategoryService;
+ @GetMapping("/getPacList")
+ @ApiOperation(value = "鏌ヨ浣撴濂楅鍒楄〃(鑷甫鏈夊垎椤�)(鏂�)")
+ //@PreAuthorize("@ss.hasPermi('hosp:package:list')")
+ public TableDataInfo getPacList(@ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
+ startPage();
+ List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
+ if (null != list && list.size() > 0) {
+ for (TjPackage aPackage : list) {
+ aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId())));
+ final String keywords = aPackage.getKeywords();
+ if (keywords != null) {
+ final String[] strings = keywords.split(",");
+ aPackage.setKeyNames(mallKeywordService.getKeyNames(strings));
+ aPackage.setKeyIds(mallKeywordService.getKeyIds(strings));
+ }
+
+ final MallCategory byId = mallCategoryService.getById(aPackage.getCategoryId());
+ if (byId != null) {
+ aPackage.setCategoryNames(byId.getName());
+ }
+ }
+ }
+ return getDataTable(list);
+ }
+
+
+ @GetMapping("/getPacInFo")
+ @ApiOperation(value = "鏌ヨ浣撴濂楅鍒楄〃(璇︾粏)(鑷甫鏈夊垎椤�)(鏂�)")
+ //@PreAuthorize("@ss.hasPermi('hosp:package:list')")
+ 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());
+ }
+
+ }
+ }
+ }
+ aPackage.setTjProjectList(tjProjectList);
+ }
+ return AjaxResult.success(aPackage);
+ }
+
+
/**
* 鏌ヨ浣撴濂楅鍒楄〃
*/
--
Gitblit v1.8.0