From d9865c5576c8ed413d2b69a36b3ec5f15bee015b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 22 四月 2024 00:33:36 +0800
Subject: [PATCH] 功能调整
---
data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java | 13 ++++++++++++-
system-run/src/main/resources/application-dev.yml | 8 ++++----
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java | 17 ++++++++++++++++-
system-run/src/main/resources/application.yml | 2 +-
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 2 --
data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java | 1 -
data-server/src/main/resources/mapper/DataReportingMapper.xml | 2 +-
7 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
index e916fa2..a7c273c 100644
--- a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
+++ b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -270,7 +270,6 @@
} catch (ParseException e) {
throw new ErrorException("鏂囦欢涓棩鏈熷湪杞崲鏃跺嚭鐜伴敊璇�");
}
- deleteAllFans(LocalDate.parse(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
for (int i = 6; i < rows.size(); i++) {
FansSubmit fansSubmit = new FansSubmit();
for (int i1 = 0; i1 < rows.get(5).size(); i1++) {
@@ -325,7 +324,6 @@
} catch (ParseException e) {
throw new ErrorException("鏂囦欢涓棩鏈熷湪杞崲鏃跺嚭鐜伴敊璇�");
}
- deleteAllFinance(LocalDate.parse(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
for (int i = 6; i < rows.size(); i++) {
FinanceSubmit financeSubmit = new FinanceSubmit();
for (int i1 = 0; i1 < rows.get(5).size(); i1++) {
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
index 18c6d4f..1b54a9b 100644
--- a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
+++ b/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
@@ -29,7 +29,6 @@
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("鐧昏浜�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(3)
private String registrant;
@ApiModelProperty("濮撳悕")
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
index 70134e2..d468ac9 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -97,7 +98,17 @@
date2 = LocalDateTime.parse(date + "T00:00:00").minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
fansSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
}
- fansSubmitMapper.insert(fansSubmit);
+ try {
+ FansSubmit fansSubmit1 = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getCustom, fansSubmit.getCustom()).eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).last("limit 1"));
+ if(BeanUtil.isEmpty(fansSubmit1)){
+ fansSubmitMapper.insert(fansSubmit);
+ }else{
+ fansSubmit1.setFansAdd(fansSubmit.getFansAdd());
+ fansSubmitMapper.updateById(fansSubmit1);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).select(FansSubmit::getFansAdd).like(FansSubmit::getCreateTime, date));
Integer sum = 0;
for (FansSubmit fansSubmit2 : fansSubmits) {
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 c62702b..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));
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index 41bbdfe..c3aa0cd 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -79,7 +79,7 @@
create_user
from data_reporting
where create_time >= #{startTime} and create_time <= #{endTime}
- group by name2,product, date_format(create_time, '%Y-%m-%d')
+ group by department,product, date_format(create_time, '%Y-%m-%d')
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 6857656..3bef62d 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -5,20 +5,20 @@
logging:
config: classpath:logback-spring.xml
# 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- file-location:
+ file-location: D:\椤圭洰鏂囦欢瀛樺偍\log
# 鏁版嵁搴撳浠借矾寰�
backup:
# 鏁版嵁搴撳浠借矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- path: D:\楣撻洀鍏徃\frame-after
+ path: D:\椤圭洰鏂囦欢瀛樺偍\log
# 鏁版嵁搴撳浠藉ぉ鏁�
destiny: 7
# 鏁版嵁搴撳浠藉伐鍏疯矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- mysqldump: E:\JavaCode\WMS\WMS_Admin\src\main\resources
+ mysqldump: D:\椤圭洰鏂囦欢瀛樺偍\log
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
- path: D:/webapp/images
+ path: D:\椤圭洰鏂囦欢瀛樺偍\image
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
diff --git a/system-run/src/main/resources/application.yml b/system-run/src/main/resources/application.yml
index a43a119..cfbe348 100644
--- a/system-run/src/main/resources/application.yml
+++ b/system-run/src/main/resources/application.yml
@@ -26,4 +26,4 @@
okhttp:
enabled: true # 寮�鍚� okhttp
-outPath: D:/Download/
\ No newline at end of file
+outPath: D:\椤圭洰鏂囦欢瀛樺偍\image
\ No newline at end of file
--
Gitblit v1.9.3