From 9017efdeaa64c6d5f0fd0bae4c9f28dcfcf53220 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 09 一月 2025 14:49:51 +0800
Subject: [PATCH] zjh20250109
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 024a900..2f592be 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -274,11 +274,11 @@
@Log(title = "浣撴椤圭洰", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody @ApiParam(value = "浣撴椤圭洰瀵硅薄") TjProject tjProject) {
- if (null != tjProject.getConsumablesList() && tjProject.getConsumablesList().size() > 0) {
+ if (null != tjProject.getConsumablesList() && !tjProject.getConsumablesList().isEmpty()) {
tjProject.setProPrice(BigDecimal.valueOf(0.00));
tjProject.setProStandard(0);
}
- if (null != tjProject.getTjStandardList() && tjProject.getTjStandardList().size() > 0) {
+ if (null != tjProject.getTjStandardList() && !tjProject.getTjStandardList().isEmpty()) {
tjProject.setProStandard(1);
}
tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
@@ -290,7 +290,7 @@
dictProSfxmService.save(proSfxm);
}
List<TjConsumables> consumablesList = tjProject.getConsumablesList();
- if (null != consumablesList && consumablesList.size() > 0) {
+ if (null != consumablesList && !consumablesList.isEmpty()) {
for (TjConsumables tjConsumables : consumablesList) {
TjProConsumables proConsumables = new TjProConsumables();
proConsumables.setProId(tjProject.getProId());
@@ -299,7 +299,7 @@
}
}
List<TjStandard> tjStandardList = tjProject.getTjStandardList();
- if (null != tjStandardList && tjStandardList.size() > 0) {
+ if (null != tjStandardList && !tjStandardList.isEmpty()) {
for (TjStandard tjStandard : tjStandardList) {
TjStandard tjStandard1 = new TjStandard();
BeanUtils.copyBeanProp(tjStandard1, tjStandard);
@@ -312,23 +312,25 @@
}
Long proParentId = tjProject.getProParentId();
if (null != proParentId && proParentId != 0) {
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, proParentId);
- List<TjProject> projectList = tjProjectService.list(wq);
- if (null != projectList && projectList.size() > 0) {
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, proParentId);
+// wq.eq(TjProject::getProStatus,0);
+// List<TjProject> projectList = tjProjectService.list(wq);
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
+ if (null != projectList && !projectList.isEmpty()) {
BigDecimal bigDecimal = new BigDecimal("0.00");
for (TjProject project : projectList) {
if (project.getProPrice() != null) {
- bigDecimal = bigDecimal.add(project.getProPrice());
+ bigDecimal = bigDecimal.add(project.getProPrice().multiply(new BigDecimal(project.getSl())));
}
}
- if (tjProject.getProPrice() != null) {
- bigDecimal.add(tjProject.getProPrice());
- }
+// if (tjProject.getProPrice() != null) {
+// bigDecimal.add(tjProject.getProPrice());
+// }
TjProject byId = tjProjectService.getById(proParentId);
tjProject.setIsSampling(byId.getIsSampling());
tjProjectService.updateById(tjProject);
- byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN));
+ byId.setProPrice(bigDecimal);
tjProjectService.updateById(byId);
}
}
@@ -445,19 +447,19 @@
}
Long proParentId = tjProject.getProParentId();
if (null != proParentId) {
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, proParentId);
- wq.eq(TjProject::getProStatus,0);
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, proParentId);
+// wq.eq(TjProject::getProStatus,0);
// List<TjProject> projectList = tjProjectService.list(wq);
List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
if (null != projectList && !projectList.isEmpty()) {
BigDecimal bigDecimal = new BigDecimal("0.00");
for (TjProject project : projectList) {
- bigDecimal = bigDecimal.add(project.getProPrice());
+ bigDecimal = bigDecimal.add(project.getProPrice().multiply(new BigDecimal(project.getSl())));
}
- bigDecimal.add(tjProject.getProPrice());
+// bigDecimal.add(tjProject.getProPrice());
TjProject byId = tjProjectService.getById(proParentId);
- byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN));
+ byId.setProPrice(bigDecimal);
tjProjectService.updateById(byId);
}
}
--
Gitblit v1.8.0