From 2f7d5cc2334d37297bbe2895525d1b40b3a921f8 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 21 六月 2024 16:41:49 +0800 Subject: [PATCH] zjh 2024/06/20-2 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index 0b2e9f7..5d106d5 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -1926,6 +1926,7 @@ map.put("proPrantId", entry.getKey().toString()); if (null != pacId) { TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId()); + map.put("tjCategory",aPackage.getTjCategory()); map.put("pacName", aPackage.getPacName()); TjProject tjProject = projectService.getById(entry.getKey()); // TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId) @@ -1938,6 +1939,7 @@ // } map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId)); } else { + map.put("tjCategory",null); map.put("pacName", "鍗曢」"); List<TbTransition> tbTransitionList = entry.getValue(); if (null != tbTransitionList && tbTransitionList.size() > 0) { @@ -1976,6 +1978,7 @@ map.put("proPrantId", entry.getKey().toString()); if (null != pacId) { TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId()); + map.put("tjCategory",aPackage.getTjCategory()); map.put("pacName", aPackage.getPacName()); TjProject tjProject = projectService.getById(entry.getKey()); // TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId) @@ -1988,6 +1991,7 @@ // } map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId)); } else { + map.put("tjCategory",null); map.put("pacName", "鍗曢」"); List<TbTransition> tbTransitionList = entry.getValue(); if (null != tbTransitionList && tbTransitionList.size() > 0) { -- Gitblit v1.8.0