From f55271878d0599d7246b8c19a6501da13342d446 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 08 四月 2024 08:21:16 +0800
Subject: [PATCH] 调整
---
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 deletions(-)
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..07c2a5a 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
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.file.FileReader;
@@ -128,7 +129,11 @@
for (FansSubmit fansSubmit : fansSubmits) {
sum += fansSubmit.getFansAdd();
}
- dataReporting2.setFansAdd(sum);
+ if (dataReporting.getFansAdd()!=null||dataReporting.getFansAdd()!=0){
+ dataReporting2.setFansAdd(dataReporting.getFansAdd());
+ }else{
+ dataReporting2.setFansAdd(sum);
+ }
return dataReportingMapper.updateById(dataReporting2);
}
@@ -168,19 +173,13 @@
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;
-// for (FansSubmit fansSubmit : fansSubmits) {
-// sum += fansSubmit.getFansAdd();
-// }
-// dataReporting.setFansAdd(sum);
if(ObjectUtil.isNotEmpty(financeSubmit)){
dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
}
@@ -211,27 +210,26 @@
dataReporting.setRemark(dataReporting.getConsumption().subtract(dataReporting.getRebateConsumption()));
} catch (Exception e) {
}
-// dataReporting.setVxCard(param);
-// if (ObjectUtil.isEmpty(one)) {
dataReporting.setRegistrant(map.get("name"));
dataReporting.setDepartment(map.get("department"));
dataReporting.setCreateTime(LocalDateTime.parse(date2 + " " + new SimpleDateFormat("HH:mm:ss").format(new Date()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- dataReportingMapper.insert(dataReporting);
-// } else {
-// dataReporting.setId(one.getId());
-// dataReporting.setName(null);
-// dataReportingMapper.updateById(dataReporting);
-// }
+ DataReporting dataReporting1 = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery()
+ .eq(DataReporting::getName, dataReporting.getName())
+ .eq(DataReporting::getAccountConsumption, dataReporting.getAccountConsumption())
+ .eq(DataReporting::getShowNum, dataReporting.getShowNum())
+ .eq(DataReporting::getClick, dataReporting.getClick()));
+ if(BeanUtil.isNotEmpty(dataReporting1)){
+ dataReporting.setId(dataReporting1.getId());
+ dataReportingMapper.updateById(dataReporting);
+ }else{
+ dataReportingMapper.insert(dataReporting);
+ }
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Integer delDataReporting(Integer id) {
- /*List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getDataId, id).select(FansSubmit::getId));
- if(fansSubmits.size()>0)fansSubmitMapper.deleteBatchIds(fansSubmits);
- List<FinanceSubmit> financeSubmits = financeSubmitMapper.selectList(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getDataId, id).select(FinanceSubmit::getId));
- if(financeSubmits.size()>0)financeSubmitMapper.deleteBatchIds(financeSubmits);*/
return dataReportingMapper.deleteById(id);
}
@@ -412,12 +410,18 @@
}
@Override
+ public List<String> selectDataReportingForProduct(String time) {
+ return dataReportingMapper.selectDataReportingForProduct(time.split(" ")[0]);
+ }
+
+ @Override
public int updateVxCards(List<DataReporting> list) {
for (DataReporting reporting : list) {
updateDataReporting(reporting);
}
return 1;
}
+
}
--
Gitblit v1.9.3