From 6b6acb4f91f7dcd3ba03652e7546ff06b0b58a28 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 23 四月 2024 02:42:47 +0800
Subject: [PATCH] 功能调整
---
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
index 141653b..d42da6c 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -121,7 +122,21 @@
date2 = LocalDateTime.parse(date + "T00:00:00").minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
financeSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
}
- financeSubmitMapper.insert(financeSubmit);
+ try {
+ FinanceSubmit financeSubmit1 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).last("limit 1"));
+ if(BeanUtil.isEmpty(financeSubmit1)){
+ financeSubmitMapper.insert(financeSubmit);
+ }else{
+ financeSubmit1.setConsumption(financeSubmit.getConsumption());
+ financeSubmit1.setAgentRebate(financeSubmit.getAgentRebate());
+ financeSubmit1.setMoney(financeSubmit.getMoney());
+ financeSubmit1.setEmployeeRebate(financeSubmit.getEmployeeRebate());
+ financeSubmit1.setEmployeeRebateMoney(financeSubmit.getEmployeeRebateMoney());
+ financeSubmitMapper.updateById(financeSubmit1);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
FinanceSubmit financeSubmit2 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, date).orderByDesc(FinanceSubmit::getId).last("limit 1"));
if(ObjectUtil.isEmpty(financeSubmit2))return 1;
List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).like(DataReporting::getCreateTime, date2));
@@ -135,6 +150,14 @@
public String getYesterday(){
return LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
}
+
+ @Override
+ public void deleteAllFinance(String date) {
+ List<FinanceSubmit> list = financeSubmitMapper.selectList(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCreateUser, getLook.selectPowerByMethodAndUserId("selectDataReportingList").get("userId")).like(FinanceSubmit::getCreateTime, date).select(FinanceSubmit::getId));
+ for (FinanceSubmit financeSubmit : list) {
+ delFinanceSubmit(financeSubmit.getId());
+ }
+ }
}
--
Gitblit v1.9.3