From 8dfd35fb7c70018976bb6e414c06c9708cae3d4f Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期一, 17 六月 2024 14:40:13 +0800
Subject: [PATCH] 测试pdf报告类
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 b7cecfa..211026c 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
@@ -401,11 +401,12 @@
BigDecimal money = new BigDecimal("0.00");
for (TjProject tjProject : tjProjectList) {
TjPackageProject tjpp = new TjPackageProject();
- if (null != tjProject.getPriceNow()) {
- tjpp.setPriceNow(tjProject.getPriceNow().setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
- } else {
- tjpp.setPriceNow(tjProject.getProPrice());
- }
+// if (null != tjProject.getPriceNow()) {
+// tjpp.setPriceNow(tjProject.getPriceNow().setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+// } else {
+// tjpp.setPriceNow(tjProject.getProPrice());
+// }
+ tjpp.setPriceNow(tjProject.getProPrice());
tjpp.setProId(tjProject.getProId());
tjpp.setPacId(tjPackage.getPacId());
//鍒ゆ柇褰撳墠濂楅涓嬫湁娌℃湁杩欎釜椤圭洰 鏈夌殑璇濊烦杩囨坊鍔�
@@ -417,8 +418,8 @@
continue;
}
ppservice.save(tjpp);
- if (null != tjProject.getPriceNow()) {
- money = money.add(tjProject.getPriceNow());
+ if (null != tjProject.getProPrice()) {
+ money = money.add(tjProject.getProPrice());
}
}
tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
@@ -455,16 +456,17 @@
}
TjPackageProject tjpp = new TjPackageProject();
- if (null != tjProject.getPriceNow()) {
- tjpp.setPriceNow(tjProject.getPriceNow());
- } else {
- tjpp.setPriceNow(new BigDecimal(0).setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
- }
+// if (null != tjProject.getPriceNow()) {
+// tjpp.setPriceNow(tjProject.getPriceNow());
+// } else {
+// tjpp.setPriceNow(new BigDecimal(0).setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
+// }
+ tjpp.setPriceNow(tjProject.getProPrice());
tjpp.setProId(tjProject.getProId());
tjpp.setPacId(tjPackage.getPacId());
ppservice.save(tjpp);
- if (null != tjProject.getPriceNow()) {
- money = money.add(tjProject.getPriceNow());
+ if (null != tjProject.getProPrice()) {
+ money = money.add(tjProject.getProPrice());
}
}
tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
--
Gitblit v1.8.0