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 | 58 +++++++++++-----------------------------------------------
1 files changed, 11 insertions(+), 47 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 39896a1..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,26 +1,16 @@
package com.ycl.platform.service.impl;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.enums.CellExtraTypeEnum;
-import com.alibaba.excel.metadata.CellExtra;
-import com.alibaba.excel.read.listener.ReadListener;
-import com.alibaba.fastjson2.JSON;
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.entity.TContract;
+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 com.ycl.system.domain.TreeNode;
-import com.ycl.system.domain.TreeUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
import utils.DateUtils;
-import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -33,6 +23,8 @@
public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateRule> implements ICalculateRuleService {
@Autowired
private CalculateRuleMapper calculateRuleMapper;
+ @Autowired
+ private TContractMapper contractMapper;
/**
* 鏌ヨ杩濈害瑙勫垯
@@ -42,7 +34,7 @@
*/
@Override
public CalculateRule selectDefaultRuleById(Long id) {
- return calculateRuleMapper.selectDefaultRuleById(id);
+ return calculateRuleMapper.selectById(id);
}
/**
@@ -102,43 +94,15 @@
return calculateRuleMapper.deleteDefaultRuleById(id);
}
- /**
- * 鑾峰彇鍚堝悓Excel瑙勫垯
- *
- * @param file 鍚堝悓Excel鏂囦欢
- * @return 瑙勫垯
- */
-
@Override
- public List<CalculateRule> readExcel(MultipartFile file) {
- List<CalculateRule> calculateRuleList = new ArrayList<>();
- try {
- EasyExcel.read(file.getInputStream(), CalculateRule.class, new ReadListener<CalculateRule>() {
- @Override
- public void invoke(CalculateRule calculateRule, AnalysisContext analysisContext) {
- calculateRule.setId(null);
- calculateRuleList.add(calculateRule);
- }
-
- @Override
- public void doAfterAllAnalysed(AnalysisContext analysisContext) {
- }
-
- })
- .head(CalculateRule.class)
- .sheet()
- .doRead();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return calculateRuleList;
+ public List<CalculateRule> getRuleListByContractId(Integer contractId) {
+ return new LambdaQueryChainWrapper<>(calculateRuleMapper)
+ .eq(CalculateRule::getContractId, contractId)
+ .list();
}
@Override
- public List<CalculateRule> getRuleListByContractId(Integer contractId) {
- List<CalculateRule> list = new LambdaQueryChainWrapper<>(calculateRuleMapper)
- .eq(CalculateRule::getContractId, contractId)
- .list();
- return TreeUtils.build(list, 0L);
+ public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
+ return calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
}
}
--
Gitblit v1.8.0