From 1f086217a887d7c2b4f6083de58b41122f45d1ab Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 22 三月 2024 17:57:49 +0800
Subject: [PATCH] zjh 2024/03/22--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 8 +++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 48 ++++++++++++++++++++++++++++++------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java | 2 +-
3 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
index 2fabecc..fb2a09c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
@@ -141,7 +141,7 @@
if (null != project) {
return AjaxResult.success(project.getProPrice());
}
- return AjaxResult.error("娌℃壘鍒板搴旈」鐩� 璇疯嚜瀹氫箟璐圭敤");
+ return AjaxResult.success("娌℃壘鍒板搴旈」鐩� 璇疯嚜瀹氫箟璐圭敤");
}
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 4553b5f..8d66d30 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
@@ -1099,7 +1099,13 @@
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
- BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
+
+ BigDecimal divide = BigDecimal.valueOf(0);
+ if(tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0))==0 || project.getProPrice().compareTo(BigDecimal.valueOf(0))==0 ){
+ divide=BigDecimal.valueOf(0);
+ }else {
+ divide=tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
+ }
List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
if (null != tjProSonList && tjProSonList.size() > 0) {
//addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
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 cbcdb7a..74dbb7c 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
@@ -83,25 +83,15 @@
@GetMapping("/getDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
public AjaxResult getDxList() {
-// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
-// wq0.eq(TjProject::getProParentId, 0);
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if(null !=config && config.equals("N")){
tjProjects = tjProjectService.getOpenDxTjProjectList();
}
- //涓婇潰鐨勬崲sql
-// final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
-
if (tjProjects != null) {
for (TjProject project : tjProjects) {
List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
project.setTjProjectList(projectList);
-
-// SysDept sysDept = deptService.selectDeptById(project.getDeptId());
-// if (sysDept!=null){
-// project.setDeptName(sysDept.getDeptName());
-// }
}
}
String key = configService.selectConfigByKey("is_open_sfxm");
@@ -544,13 +534,35 @@
TjProject tjProject = tjProjectService.getById(proId);
return AjaxResult.success(tjProject);
}
-// /**
-// * 鑾峰彇閮ㄩ棬鏍戝垪琛�
-// */
-// @GetMapping("/deptTree")
-// @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
-// public AjaxResult deptTree(SysDept dept) {
-// return success(deptService.selectDeptTreeList(dept));
-// }
+
+
+ /**
+ * 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+ */
+ @GetMapping("/getProParentIdDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getProParentIdDxList() {
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+ String config = configService.selectConfigByKey("tj_dxsxtj");
+ if(null !=config && config.equals("N")){
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
+ }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",tjProjects);
+ map.put("key",key);
+ return AjaxResult.success(map);
+ }
+
+ @GetMapping("/getProSonDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鏍规嵁鐖堕」id閫夋嫨瀛愰」)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getProSonDxList(@RequestParam String proId) {
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(proId);
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",projectList);
+ map.put("key",key);
+ return AjaxResult.success(map);
+ }
}
--
Gitblit v1.8.0