From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复

---
 ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java |   66 +++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
index d72bc17..30d5dc4 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
@@ -5,7 +5,6 @@
 import com.ycl.platform.service.ICalculateRuleService;
 import com.ycl.system.AjaxResult;
 import com.ycl.system.controller.BaseController;
-import com.ycl.system.page.TableDataInfo;
 import com.ycl.utils.poi.ExcelUtil;
 import enumeration.BusinessType;
 import jakarta.servlet.http.HttpServletResponse;
@@ -16,83 +15,102 @@
 import java.util.List;
 
 /**
- * 鏍哥畻瑙勫垯Controller
+ * 鏍哥畻瑙勫垯(鍒�)Controller
  *
  * @author ruoyi
  * @date 2024-04-01
  */
 @RestController
-@RequestMapping("/check/calculateRule")
+@RequestMapping("/calculate/rule")
 public class CalculateRuleController extends BaseController
 {
     @Autowired
-    private ICalculateRuleService calculateRuleService;
+    private ICalculateRuleService defaultRuleService;
 
     /**
-     * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+     * 鏌ヨ杩濈害瑙勫垯鍒楄〃
      */
     @PreAuthorize("@ss.hasPermi('system:rule:list')")
     @GetMapping("/list")
-    public TableDataInfo list(CalculateRule calculateRule)
+    public AjaxResult list(CalculateRule calculateRule)
     {
-        startPage();
-        List<CalculateRule> list = calculateRuleService.selectCalculateRuleList(calculateRule);
-        return getDataTable(list);
+        List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule);
+        return success(list);
     }
 
     /**
-     * 瀵煎嚭鏍哥畻瑙勫垯鍒楄〃
+     * 鏍规嵁鍚堝悓id鏌ヨ杩濈害瑙勫垯鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:rule:query')")
+    @GetMapping("/getRuleListByContractId")
+    public AjaxResult getRuleListByContractId(Integer contractId)
+    {
+        return success(defaultRuleService.getRuleListByContractId(contractId));
+    }
+
+    /**
+     * 鏍规嵁杩愮淮鍗曚綅鏌ヨ杩濈害瑙勫垯鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('system:rule:query')")
+    @GetMapping("/getRuleListByUnitId")
+    public AjaxResult getRuleListByUnitId(Integer unitId)
+    {
+        return success(defaultRuleService.getRuleListByUnitId(unitId));
+    }
+
+    /**
+     * 瀵煎嚭杩濈害瑙勫垯鍒楄〃
      */
     @PreAuthorize("@ss.hasPermi('system:rule:export')")
-    @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.EXPORT)
+    @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CalculateRule calculateRule)
     {
-        List<CalculateRule> list = calculateRuleService.selectCalculateRuleList(calculateRule);
+        List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule);
         ExcelUtil<CalculateRule> util = new ExcelUtil<CalculateRule>(CalculateRule.class);
-        util.exportExcel(response, list, "鏍哥畻瑙勫垯鏁版嵁");
+        util.exportExcel(response, list, "杩濈害瑙勫垯鏁版嵁");
     }
 
     /**
-     * 鑾峰彇鏍哥畻瑙勫垯璇︾粏淇℃伅
+     * 鑾峰彇杩濈害瑙勫垯璇︾粏淇℃伅
      */
     @PreAuthorize("@ss.hasPermi('system:rule:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(calculateRuleService.selectCalculateRuleById(id));
+        return success(defaultRuleService.selectDefaultRuleById(id));
     }
 
     /**
-     * 鏂板鏍哥畻瑙勫垯
+     * 鏂板杩濈害瑙勫垯
      */
     @PreAuthorize("@ss.hasPermi('system:rule:add')")
-    @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.INSERT)
+    @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CalculateRule calculateRule)
     {
-        return toAjax(calculateRuleService.insertCalculateRule(calculateRule));
+        return toAjax(defaultRuleService.insertDefaultRule(calculateRule));
     }
 
     /**
-     * 淇敼鏍哥畻瑙勫垯
+     * 淇敼杩濈害瑙勫垯
      */
     @PreAuthorize("@ss.hasPermi('system:rule:edit')")
-    @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.UPDATE)
+    @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CalculateRule calculateRule)
     {
-        return toAjax(calculateRuleService.updateCalculateRule(calculateRule));
+        return toAjax(defaultRuleService.updateDefaultRule(calculateRule));
     }
 
     /**
-     * 鍒犻櫎鏍哥畻瑙勫垯
+     * 鍒犻櫎杩濈害瑙勫垯
      */
     @PreAuthorize("@ss.hasPermi('system:rule:remove')")
-    @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.DELETE)
+    @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(calculateRuleService.deleteCalculateRuleByIds(ids));
+        return toAjax(defaultRuleService.deleteDefaultRuleByIds(ids));
     }
 }

--
Gitblit v1.8.0