From 8e57b508f55de8f43c5e504e844ba8c256dce619 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 28 四月 2024 10:32:26 +0800
Subject: [PATCH] 字典查询时间排序
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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..eeb6d56 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,10 +3,13 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.merge.LoopMergeStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.mapper.TContractMapper;
@@ -30,6 +33,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
@@ -42,6 +46,7 @@
public class TContractServiceImpl extends ServiceImpl<TContractMapper, TContract> implements ITContractService {
private final ICalculateRuleService calculateRuleService;
+ private final CalculateMoneyRuleServiceImpl calculateMoneyRuleService;
private final YwUnitServiceImpl ywUnitService;
@Override
@@ -135,7 +140,9 @@
// 閬嶅巻鐖跺瓙鍏崇郴
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,22 +159,40 @@
}
// 淇濆瓨鐖惰鍒欒幏鍙栫埗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("鎿嶄綔鎴愬姛");
}
@@ -179,4 +204,9 @@
tContract -> tContract.setUnitName(ywUnitService.getById(tContract.getUnitId()).getUnitName())
).toList();
}
+
+ @Override
+ public List<CalculateMoneyRule> selectMoneyRules(Integer contractId) {
+ return calculateMoneyRuleService.selectMoneyRules(contractId);
+ }
}
--
Gitblit v1.8.0