From fea22e82e7e49691f6e0c20a29b228d0ab3173e9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 29 十月 2025 17:08:38 +0800
Subject: [PATCH] 修改问题
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 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 21935bf..078814f 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,14 +1,20 @@
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.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.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 杩濈害瑙勫垯Service涓氬姟灞傚鐞�
@@ -17,10 +23,11 @@
* @date 2024-04-01
*/
@Service
-public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateRule> implements ICalculateRuleService
-{
+public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateRule> implements ICalculateRuleService {
@Autowired
private CalculateRuleMapper calculateRuleMapper;
+ @Autowired
+ private TContractMapper contractMapper;
/**
* 鏌ヨ杩濈害瑙勫垯
@@ -29,9 +36,8 @@
* @return 杩濈害瑙勫垯
*/
@Override
- public CalculateRule selectDefaultRuleById(Long id)
- {
- return calculateRuleMapper.selectDefaultRuleById(id);
+ public CalculateRule selectDefaultRuleById(Long id) {
+ return calculateRuleMapper.selectById(id);
}
/**
@@ -41,8 +47,7 @@
* @return 杩濈害瑙勫垯
*/
@Override
- public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule)
- {
+ public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule) {
return calculateRuleMapper.selectDefaultRuleList(calculateRule);
}
@@ -53,8 +58,7 @@
* @return 缁撴灉
*/
@Override
- public int insertDefaultRule(CalculateRule calculateRule)
- {
+ public int insertDefaultRule(CalculateRule calculateRule) {
calculateRule.setCreateTime(DateUtils.getNowDate());
return calculateRuleMapper.insertDefaultRule(calculateRule);
}
@@ -66,8 +70,7 @@
* @return 缁撴灉
*/
@Override
- public int updateDefaultRule(CalculateRule calculateRule)
- {
+ public int updateDefaultRule(CalculateRule calculateRule) {
calculateRule.setUpdateTime(DateUtils.getNowDate());
return calculateRuleMapper.updateDefaultRule(calculateRule);
}
@@ -79,8 +82,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteDefaultRuleByIds(Long[] ids)
- {
+ public int deleteDefaultRuleByIds(Long[] ids) {
return calculateRuleMapper.deleteDefaultRuleByIds(ids);
}
@@ -91,8 +93,29 @@
* @return 缁撴灉
*/
@Override
- public int deleteDefaultRuleById(Long 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) {
+ List<CalculateRuleCascaderVO> ruleListByUnitId = calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
+ Map<String, List<CalculateRuleCascaderVO>> map = ruleListByUnitId.stream().collect(Collectors.groupingBy(CalculateRuleCascaderVO::getRuleName));
+ List<CalculateRuleCascaderVO> result = new ArrayList<>();
+ map.forEach((str,list)->{
+ CalculateRuleCascaderVO vo = new CalculateRuleCascaderVO();
+ vo.setValue(str);
+ vo.setLabel(str);
+ vo.setChildren(list);
+ result.add(vo);
+ });
+ return result;
+ }
}
--
Gitblit v1.8.0