From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 0c391cd..78c6249 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,7 +169,7 @@
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(),""));
@@ -275,13 +275,18 @@
*/
@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);
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);
}
--
Gitblit v1.8.0