From 95f0a8b4d82a859f2018c9d77e1a8a3a38b2d523 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 17:06:50 +0800
Subject: [PATCH] 报备记录、编号工具方法
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
index c3e1b55..855a8a2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
@@ -3,24 +3,31 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.merge.LoopMergeStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.handler.CommentWriteHandler;
import com.ycl.handler.CustomSheetWriteHandler;
+import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.domain.entity.CalculateRule;
import com.ycl.platform.domain.entity.TContract;
+import com.ycl.platform.domain.query.ContractQuery;
+import com.ycl.platform.domain.vo.ContractVO;
import com.ycl.platform.mapper.TContractMapper;
import com.ycl.platform.service.ICalculateRuleService;
import com.ycl.platform.service.ITContractService;
import com.ycl.system.AjaxResult;
+import com.ycl.system.Result;
+import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
+import enumeration.ContractStatus;
import enumeration.general.RuleDeductCategoryEnum;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.multipart.MultipartFile;
@@ -30,6 +37,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
@@ -42,6 +50,7 @@
public class TContractServiceImpl extends ServiceImpl<TContractMapper, TContract> implements ITContractService {
private final ICalculateRuleService calculateRuleService;
+ private final CalculateMoneyRuleServiceImpl calculateMoneyRuleService;
private final YwUnitServiceImpl ywUnitService;
@Override
@@ -129,13 +138,14 @@
public AjaxResult importData(MultipartFile file, TContract tContract) {
// 淇濆瓨鍚堝悓
tContract.setCreateTime(DateUtils.getNowDate());
- tContract.setDeleted("0");
save(tContract);
List<CalculateRule> list = calculateRuleService.readExcel(file);
// 閬嶅巻鐖跺瓙鍏崇郴
List<CalculateRule> calculateRulesToSave = new ArrayList<>();
- CalculateRule temp = new CalculateRule();
+ CalculateRule fu1 = new CalculateRule();
+ CalculateRule fu2 = new CalculateRule();
+ boolean fuNew = true;
for (CalculateRule calculateRule : list) {
// 鍒ゆ柇鏁版嵁瀹屾暣鎬�
if (ObjectUtils.isEmpty(calculateRule.getDeductCategory())) {
@@ -152,31 +162,70 @@
}
// 淇濆瓨鐖惰鍒欒幏鍙栫埗id
if (StringUtils.isNotBlank(calculateRule.getRuleName())) {
- CalculateRule fu = new CalculateRule();
- fu.setContractId(tContract.getId().intValue());
- fu.setRuleName(calculateRule.getRuleName());
- fu.setCreateTime(DateUtils.getNowDate());
- fu.setDeleted(0);
- calculateRuleService.save(fu);
- temp = fu;
+ CalculateRule one = new CalculateRule();
+ one.setParentId(0L);
+ one.setContractId(tContract.getId().intValue());
+ one.setRuleName(calculateRule.getRuleName());
+ one.setCreateTime(DateUtils.getNowDate());
+ one.setDeleted(0);
+ calculateRuleService.save(one);
+ fu1 = one;
+ fuNew = true;
+ }
+ // 淇濆瓨绗簩灞傜埗瑙勫垯鑾峰彇绗簩灞傜埗id
+ if (StringUtils.isNotBlank(calculateRule.getRuleDesc())) {
+ CalculateRule two = new CalculateRule();
+ two.setContractId(tContract.getId().intValue());
+ two.setParentId(fu1.getId());
+ two.setRuleDesc(calculateRule.getRuleDesc());
+ two.setCreateTime(DateUtils.getNowDate());
+ two.setDeleted(0);
+ calculateRuleService.save(two);
+ fu2 = two;
+ fuNew = false;
}
calculateRule.setContractId(tContract.getId().intValue());
calculateRule.setCreateTime(DateUtils.getNowDate());
calculateRule.setDeleted(0);
- calculateRule.setParentId(temp.getId());
+ calculateRule.setParentId(fuNew ? fu1.getId() : fu2.getId());
calculateRulesToSave.add(calculateRule);
}
// 鎵归噺淇濆瓨瑙勫垯
calculateRuleService.saveBatch(calculateRulesToSave);
+ //鎵归噺淇濆瓨鑰冩牳缁撴灉搴旂敤瑙勫垯
+ calculateMoneyRuleService.saveBatch(JSON.parseArray(tContract.getRuleList(), CalculateMoneyRule.class).stream().peek(
+ calculateMoneyRule -> calculateMoneyRule.setContractId(tContract.getId().intValue())
+ ).collect(Collectors.toList()));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@Override
- public List<TContract> selectAll() {
- return list(new LambdaQueryWrapper<TContract>()
- .orderByDesc(TContract::getCreateTime))
- .stream().peek(
- tContract -> tContract.setUnitName(ywUnitService.getById(tContract.getUnitId()).getUnitName())
- ).toList();
+ public Result selectAll(ContractQuery query) {
+ IPage<ContractVO> page = PageUtil.getPage(query, ContractVO.class);
+ baseMapper.getPage(page, query);
+ page.getRecords().stream().forEach(contract -> {
+ Date now = new Date();
+ if (now.before(contract.getStartTime())) {
+ contract.setStatus(ContractStatus.NOT_START);
+ } else if (now.after(contract.getEndTime())) {
+ contract.setStatus(ContractStatus.FINISHED);
+ } else {
+ contract.setStatus(ContractStatus.ACTIVE);
+ }
+ });
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+ @Override
+ public List<CalculateMoneyRule> selectMoneyRules(Integer contractId) {
+ return calculateMoneyRuleService.selectMoneyRules(contractId);
+ }
+
+ @Override
+ public List<TContract> selectUsingContract() {
+ return new LambdaQueryChainWrapper<>(baseMapper)
+ .le(TContract::getStartTime, DateUtils.getDate())
+ .ge(TContract::getEndTime, DateUtils.getDate())
+ .list();
}
}
--
Gitblit v1.8.0