From 02a11da1ca0523e4f8e3d7273904da816f951ffc Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 01:54:36 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java | 9 ++++
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java | 8 ++++
data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java | 2 +
data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java | 2
data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java | 1
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 20 ++++++++++
data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java | 4 ++
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 11 +++--
data-server/src/main/resources/mapper/DataReportingMapper.xml | 31 ++++++++++++---
9 files changed, 75 insertions(+), 13 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 b8f673f..c21f0fd 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
@@ -30,6 +30,9 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
@RequestMapping("/dataReporting")
@@ -202,6 +205,7 @@
}
list.add(reporting);
}
+ deleteAllData(format);
dataReportingService.addDataReporting(list, format, param);
return Result.success();
}
@@ -259,6 +263,7 @@
} 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++) {
@@ -313,6 +318,7 @@
} 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++) {
@@ -389,4 +395,18 @@
List<DataReporting> list = JSON.parseArray(str, DataReporting.class);
return Result.success(dataReportingService.updateVxCards(list));
}
+
+ @ApiOperation(value = "涓�閿垹闄ゆ墍鏈夎繘绮変笂鎶ョ殑鏁版嵁")
+ @PostMapping("/deleteAllFans")
+ public Result deleteAllFans(String date) {
+ fansSubmitService.deleteAllFans(date);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "涓�閿垹闄ゆ墍鏈夎储鍔′笂鎶ョ殑鏁版嵁")
+ @PostMapping("/deleteAllFinance")
+ public Result deleteAllFinance(String date) {
+ financeSubmitService.deleteAllFinance(date);
+ return Result.success();
+ }
}
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 dbbf7e1..0df5a85 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
@@ -30,6 +30,10 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ValueTableShow(3)
private String registrant;
+
+ @ApiModelProperty("濮撳悕")
+ @ValueTableShow(3)
+ private String name2;
/**
* 閮ㄩ棬
*/
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java b/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
index 6217033..e21f8ef 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
@@ -53,4 +53,5 @@
int updateVxCards(List<DataReporting> list);
+
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java b/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
index 8aed3e9..e03e195 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
@@ -27,4 +27,6 @@
String getYesterday();
+ void deleteAllFans(String date);
+
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java b/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
index 8339a69..335420a 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
@@ -22,6 +22,6 @@
int addFinanceSubmit(FinanceSubmit financeSubmit, String date, String param);
-
+ void deleteAllFinance(String date);
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
index 6357459..30ea641 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -168,12 +168,12 @@
public void addDataReporting(List<DataReporting> list, String date, String param) {
int userId = Integer.parseInt(JSONUtil.parseObj(new Jwt().readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
Map<String, String> map = dataReportingMapper.selectUser(userId);
+ String date2 = date;
+ if(date == null) {
+ date2 = fansSubmitService.getYesterday();
+ date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ } else date = LocalDateTime.parse(date+"T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (DataReporting dataReporting : list) {
- String date2 = date;
- if(date == null) {
- date2 = fansSubmitService.getYesterday();
- date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- } else date = LocalDateTime.parse(date+"T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
// List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getProduct, dataReporting.getProduct()).eq(FansSubmit::getVx, param).select(FansSubmit::getFansAdd).like(FansSubmit::getCreateTime, date));
FinanceSubmit financeSubmit = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, dataReporting.getAgent()).eq(FinanceSubmit::getName, dataReporting.getName()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, date).orderByDesc(FinanceSubmit::getId).last("limit 1"));
// Integer sum = 0;
@@ -418,6 +418,7 @@
}
return 1;
}
+
}
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 193955e..70134e2 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
@@ -127,6 +127,15 @@
queryWrapper.select("DISTINCT vx").like("create_time", format);
return fansSubmitMapper.selectList(queryWrapper);
}
+
+ @Override
+ public void deleteAllFans(String date) {
+ List<FansSubmit> list = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getCreateUser, getLook.selectPowerByMethodAndUserId("selectDataReportingList").get("userId")).like(FansSubmit::getCreateTime, date).select(FansSubmit::getId));
+ for (FansSubmit fansSubmit : list) {
+ delFansSubmit(fansSubmit.getId());
+ }
+ }
+
}
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..c62702b 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
@@ -135,6 +135,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());
+ }
+ }
}
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index 08cfa56..65a8d00 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -54,14 +54,31 @@
</select>
<select id="selectRegistrantCountDtoPageList" resultType="com.yuanchu.mom.dto.RegistrantCountDto">
select * from (
- select id, department, registrant, product, name, sum(show_num) show_num, sum(click) click,
- sum(account_consumption)account_consumption, sum(rebate_consumption)
- rebate_consumption,(sum(rebate_consumption)+sum(remark)) rebate_consumption2, sum(discounted_consumption)
- discounted_consumption, sum(fans_add) fans_add, sum(actual_cost) actual_cost, sum(customer_costs)
- customer_costs, sum(profit) profit, sum(agent_rebate) agent_rebate, sum(customer_rebate) customer_rebate,
- sum(remark) remark, create_time, update_time, create_user
+ select department,
+ registrant,
+ name2,
+ product,
+ name,
+ sum(show_num) show_num,
+ sum(click) click,
+ sum(account_consumption) account_consumption,
+ sum(rebate_consumption)
+ rebate_consumption,
+ (sum(rebate_consumption) + sum(remark)) rebate_consumption2,
+ sum(discounted_consumption)
+ discounted_consumption,
+ sum(fans_add) fans_add,
+ sum(actual_cost) actual_cost,
+ sum(customer_costs)
+ customer_costs,
+ sum(profit) profit,
+ sum(agent_rebate) agent_rebate,
+ sum(customer_rebate) customer_rebate,
+ sum(remark) remark,
+ date_format(create_time, '%Y-%m-%d') create_time,
+ create_user
from data_reporting
- group by registrant,date_format(create_time, '%Y-%m-%d')
+ group by name2,product, date_format(create_time, '%Y-%m-%d')
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
--
Gitblit v1.9.3