From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改，定时任务在线问题修改新增导出扣分明细功能
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java | 100 +++++++++++++++++++++++++++++++------------------
1 files changed, 63 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..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,95 +1,121 @@
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.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
- * 鏍哥畻瑙勫垯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) {
+ 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