From cc74c69a0b48dce77cec5674fa42bee768bb28d7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 07 三月 2025 10:59:28 +0800
Subject: [PATCH] zjh20250307
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index 9cde62d..04f9c4c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -169,14 +169,15 @@
for (Map<String, Object> map : tjDwGrouping.getMapList()) {
TjGroupingPro groupingPro=new TjGroupingPro();
groupingPro.setGroupingId(tjDwGrouping.getId());
- groupingPro.setProPrice(BigDecimal.valueOf(Long.parseLong(map.get("proPrice").toString())));
+ groupingPro.setProPrice(new BigDecimal(map.get("proPrice").toString()));
groupingPro.setProId(map.get("proId").toString());
groupingPro.setProName(map.get("proName").toString());
groupingPro.setProPyName(PinyinUtil.getFirstLetter(map.get("proName").toString(),""));
- groupingPro.setLimits(tjDwGrouping.getLimits());
- groupingPro.setYsPrice(BigDecimal.valueOf(Long.parseLong(map.get("proPrice").toString()))
- .multiply(BigDecimal.valueOf(Long.parseLong(tjDwGrouping.getLimits()))
- .divide(BigDecimal.valueOf(10))));
+ groupingPro.setLimits(map.get("limits").toString());
+// groupingPro.setYsPrice(BigDecimal.valueOf(Long.parseLong(map.get("proPrice").toString()))
+// .multiply(BigDecimal.valueOf(Long.parseLong(tjDwGrouping.getLimits()))
+// .divide(BigDecimal.valueOf(10))));
+ groupingPro.setYsPrice(new BigDecimal(map.get("ysPrice").toString()));
groupingProService.save(groupingPro);
}
}
@@ -184,6 +185,18 @@
}
return AjaxResult.error("鎿嶄綔澶辫触!");
}
+
+ @GetMapping("updateGroupProLimitsByGroupId")
+ @ApiOperation(value = "鏍规嵁鍒嗙粍id淇敼鍒嗙粍椤圭洰琛ㄦ姌鎵�")
+ public AjaxResult updateGroupProLimitsByGroupId(@RequestParam @ApiParam(value = "鍒嗙粍id") String groupId,
+ @RequestParam @ApiParam(value = "鎶樻墸") String limits) {
+ boolean a= groupingProService.updateGroupProLimitsByGroupId(groupId,limits);
+ if(a){
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
/**
* 鍒犻櫎浣撴鍗曚綅鍒嗙粍
@@ -265,7 +278,8 @@
public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName) {
LambdaQueryWrapper<TjProject> wq =new LambdaQueryWrapper<>();
wq.eq(TjProject::getProParentId,0);
- if(null !=proName && !proName.equals("")){
+ wq.eq(TjProject::getProStatus,0);
+ if(null !=proName && !proName.isEmpty()){
wq.like(TjProject::getProName,proName);
}
List<TjProject> tjProjectList = projectService.list(wq);
--
Gitblit v1.8.0