From 303a933ae58e2057f34693d5813e4128550d1081 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 03 一月 2025 20:58:25 +0800
Subject: [PATCH] zjh20250103

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 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..0c391cd 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
@@ -173,10 +173,11 @@
                     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