From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java |   87 +++++++++++++++++++++++++------------------
 1 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
index 19060ea..aaecb59 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
@@ -1,95 +1,108 @@
 package com.ycl.platform.service.impl;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.CalculateMoneyRule;
+import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.domain.vo.CalculateRuleCascaderVO;
 import com.ycl.platform.mapper.CalculateRuleMapper;
+import com.ycl.platform.mapper.TContractMapper;
 import com.ycl.platform.service.ICalculateRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import utils.DateUtils;
 
 import java.util.List;
 
 /**
- * 鏍哥畻瑙勫垯Service涓氬姟灞傚鐞�
+ * 杩濈害瑙勫垯Service涓氬姟灞傚鐞�
  *
  * @author ruoyi
- * @date 2024-04-03
+ * @date 2024-04-01
  */
 @Service
-public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateMoneyRule> implements ICalculateRuleService
-{
+public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateRule> implements ICalculateRuleService {
     @Autowired
     private CalculateRuleMapper calculateRuleMapper;
+    @Autowired
+    private TContractMapper contractMapper;
 
     /**
-     * 鏌ヨ鏍哥畻瑙勫垯
+     * 鏌ヨ杩濈害瑙勫垯
      *
-     * @param id 鏍哥畻瑙勫垯涓婚敭
-     * @return 鏍哥畻瑙勫垯
+     * @param id 杩濈害瑙勫垯涓婚敭
+     * @return 杩濈害瑙勫垯
      */
     @Override
-    public CalculateMoneyRule selectCalculateRuleById(Long id)
-    {
-        return calculateRuleMapper.selectCalculateRuleById(id);
+    public CalculateRule selectDefaultRuleById(Long id) {
+        return calculateRuleMapper.selectById(id);
     }
 
     /**
-     * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+     * 鏌ヨ杩濈害瑙勫垯鍒楄〃
      *
-     * @param calculateMoneyRule 鏍哥畻瑙勫垯
-     * @return 鏍哥畻瑙勫垯
+     * @param calculateRule 杩濈害瑙勫垯
+     * @return 杩濈害瑙勫垯
      */
     @Override
-    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule)
-    {
-        return calculateRuleMapper.selectCalculateRuleList(calculateMoneyRule);
+    public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule) {
+        return calculateRuleMapper.selectDefaultRuleList(calculateRule);
     }
 
     /**
-     * 鏂板鏍哥畻瑙勫垯
+     * 鏂板杩濈害瑙勫垯
      *
-     * @param calculateMoneyRule 鏍哥畻瑙勫垯
+     * @param calculateRule 杩濈害瑙勫垯
      * @return 缁撴灉
      */
     @Override
-    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule)
-    {
-        return calculateRuleMapper.insertCalculateRule(calculateMoneyRule);
+    public int insertDefaultRule(CalculateRule calculateRule) {
+        calculateRule.setCreateTime(DateUtils.getNowDate());
+        return calculateRuleMapper.insertDefaultRule(calculateRule);
     }
 
     /**
-     * 淇敼鏍哥畻瑙勫垯
+     * 淇敼杩濈害瑙勫垯
      *
-     * @param calculateMoneyRule 鏍哥畻瑙勫垯
+     * @param calculateRule 杩濈害瑙勫垯
      * @return 缁撴灉
      */
     @Override
-    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule)
-    {
-        return calculateRuleMapper.updateCalculateRule(calculateMoneyRule);
+    public int updateDefaultRule(CalculateRule calculateRule) {
+        calculateRule.setUpdateTime(DateUtils.getNowDate());
+        return calculateRuleMapper.updateDefaultRule(calculateRule);
     }
 
     /**
-     * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
+     * 鎵归噺鍒犻櫎杩濈害瑙勫垯
      *
-     * @param ids 闇�瑕佸垹闄ょ殑鏍哥畻瑙勫垯涓婚敭
+     * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteCalculateRuleByIds(Long[] ids)
-    {
-        return calculateRuleMapper.deleteCalculateRuleByIds(ids);
+    public int deleteDefaultRuleByIds(Long[] ids) {
+        return calculateRuleMapper.deleteDefaultRuleByIds(ids);
     }
 
     /**
-     * 鍒犻櫎鏍哥畻瑙勫垯淇℃伅
+     * 鍒犻櫎杩濈害瑙勫垯淇℃伅
      *
-     * @param id 鏍哥畻瑙勫垯涓婚敭
+     * @param id 杩濈害瑙勫垯涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteCalculateRuleById(Long id)
-    {
-        return calculateRuleMapper.deleteCalculateRuleById(id);
+    public int deleteDefaultRuleById(Long id) {
+        return calculateRuleMapper.deleteDefaultRuleById(id);
+    }
+
+    @Override
+    public List<CalculateRule> getRuleListByContractId(Integer contractId) {
+        return new LambdaQueryChainWrapper<>(calculateRuleMapper)
+                .eq(CalculateRule::getContractId, contractId)
+                .list();
+    }
+
+    @Override
+    public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
+        return calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
     }
 }

--
Gitblit v1.8.0