From 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 19:01:13 +0800
Subject: [PATCH] zjh20250620
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 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..4d828d1 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();
+ }
+
/**
* 鍒犻櫎浣撴鍗曚綅鍒嗙粍
@@ -262,13 +275,44 @@
*/
@GetMapping("/getTjParentProjectList")
@ApiOperation(value = "鑾峰彇浣撴鍗曢」椤圭洰淇℃伅")
- public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName) {
+ public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName,
+ @RequestParam(required = false) @ApiParam(value = "鎷奸煶鐮�") String pym) {
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);
}
+ if(null !=pym && !pym.isEmpty()){
+ wq.apply("LOWER(pro_eng_name) LIKE {0}", "%" + pym.toLowerCase() + "%");
+ }
+
List<TjProject> tjProjectList = projectService.list(wq);
return success(tjProjectList);
}
+
+
+ @GetMapping("/huoqutuantitaocanxiangmuList")
+ @ApiOperation(value = "鑾峰彇鎵�鏈夊崟浣嶅洟浣撳椁愰」鐩�")
+ public AjaxResult huoqutuantitaocanxiangmuList(@RequestParam(required = false) String dwId) {
+ List<TjPackage> list= tjDwGroupingService.huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(dwId);
+ if (null !=list && !list.isEmpty()){
+ for (TjPackage tjPackage : list) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjGroupingPro> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjGroupingPro::getGroupingId,tjPackage.getPacId());
+ final List<TjGroupingPro> groupingProList = groupingProService.list(wqq);
+ if (null !=groupingProList && !groupingProList.isEmpty()){
+ for (TjGroupingPro pro : groupingProList) {
+ final TjProject byId = projectService.getById(pro.getProId());
+ if(null !=byId){
+ res.add(byId);
+ }
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
+ }
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.8.0