From 06f256c166529b0c333171f76fd49eec4b66afe3 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 27 四月 2024 20:44:33 +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 | 2 +-
data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java | 3 +++
data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java | 3 ++-
system-run/src/main/resources/application.yml | 2 +-
data-server/src/main/resources/mapper/FansSubmitMapper.xml | 9 +++++++++
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 7 +++++++
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 8 +++++---
8 files changed, 36 insertions(+), 7 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 a7c273c..e20c7f2 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
@@ -96,6 +96,13 @@
return Result.success(fansSubmitService.selectFansSubmitList(page, fansSubmit));
}
+ @ApiOperation(value = "鑾峰彇杩涚矇涓婃姤鎬绘暟")
+ @PostMapping("/countFansSubmitList")
+ @ValueAuth
+ public Result countFansSubmitList(@RequestBody FansSubmit fansSubmit) {
+ return Result.success(fansSubmitService.countFansSubmitList(fansSubmit));
+ }
+
@ApiOperation(value = "鍒犻櫎杩涚矇涓婃姤鍒楄〃")
@PostMapping("/delFansSubmit")
public Result delFansSubmit(Integer id) {
diff --git a/data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java b/data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java
index bbaba54..2498d90 100644
--- a/data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java
+++ b/data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.pojo.FansSubmit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
/**
* @author Administrator
@@ -15,6 +16,8 @@
IPage<FansSubmit> selectFansSubmitPageList(IPage<FansSubmit> page, QueryWrapper<FansSubmit> ew);
+ Double countFansSubmitList(@Param("ew") QueryWrapper<FansSubmit> ew);
+
}
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 e03e195..908382e 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
@@ -1,7 +1,6 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.dto.DataReportingPageDto;
import com.yuanchu.mom.pojo.FansSubmit;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -29,4 +28,6 @@
void deleteAllFans(String date);
+ Double countFansSubmitList(FansSubmit fansSubmit);
+
}
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 e97b3e6..26cc049 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
@@ -337,6 +337,7 @@
@Override
public String downFansSubmitFile(IPage<FansSubmit> page, FansSubmit fansSubmit) {
+ fansSubmit.setCreateTime(fansSubmit.getCreateTime().plusDays(1));
Map<String, Object> map = fansSubmitService.selectFansSubmitList(page, fansSubmit);
String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
String name = "绮変笣涓婃姤" + time + ".csv";
@@ -344,7 +345,7 @@
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
writer.write(new String[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + fansSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
+ writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + fansSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
writer.write(new String[]{});
writer.write(new String[]{});
List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
@@ -366,14 +367,15 @@
@Override
public String downFinanceSubmitFile(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit) {
+ financeSubmit.setCreateTime(financeSubmit.getCreateTime().plusDays(1));
Map<String, Object> map = financeSubmitService.selectFinanceSubmitList(page, financeSubmit);
- String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
+ String time = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
String name = "璐㈠姟涓婃姤" + time + ".csv";
String path = outPath + name;
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
writer.write(new String[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
+ writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + financeSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
writer.write(new String[]{});
writer.write(new String[]{});
List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
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 d468ac9..789061e 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
@@ -99,7 +99,7 @@
fansSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
}
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"));
+ FansSubmit fansSubmit1 = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getCustom, fansSubmit.getCustom()).eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).like(FansSubmit::getCreateTime, date).last("limit 1"));
if(BeanUtil.isEmpty(fansSubmit1)){
fansSubmitMapper.insert(fansSubmit);
}else{
@@ -147,6 +147,13 @@
}
}
+ @Override
+ public Double countFansSubmitList(FansSubmit fansSubmit) {
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectFansSubmitList");
+ if(map1.get("look")==1) fansSubmit.setCreateUser(map1.get("userId"));
+ fansSubmit.setCreateTime(fansSubmit.getCreateTime().plusDays(1));
+ return fansSubmitMapper.countFansSubmitList(QueryWrappers.queryWrappers(fansSubmit));
+ }
}
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 d42da6c..717f565 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
@@ -123,7 +123,7 @@
financeSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
}
try {
- FinanceSubmit financeSubmit1 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).last("limit 1"));
+ FinanceSubmit financeSubmit1 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).like(FinanceSubmit::getCreateTime, date).last("limit 1"));
if(BeanUtil.isEmpty(financeSubmit1)){
financeSubmitMapper.insert(financeSubmit);
}else{
diff --git a/data-server/src/main/resources/mapper/FansSubmitMapper.xml b/data-server/src/main/resources/mapper/FansSubmitMapper.xml
index 35b4767..eef181a 100644
--- a/data-server/src/main/resources/mapper/FansSubmitMapper.xml
+++ b/data-server/src/main/resources/mapper/FansSubmitMapper.xml
@@ -24,5 +24,14 @@
${ew.customSqlSegment}
</if>
</select>
+ <select id="countFansSubmitList" resultType="java.lang.Double">
+ select sum(a.fans_add) from (
+ select fm.* from fans_submit fm, user u
+ where fm.create_user = u.id
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
</mapper>
diff --git a/system-run/src/main/resources/application.yml b/system-run/src/main/resources/application.yml
index cfbe348..34110bc 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:\椤圭洰鏂囦欢瀛樺偍\image
\ No newline at end of file
+outPath: D:\椤圭洰鏂囦欢瀛樺偍\image\
\ No newline at end of file
--
Gitblit v1.9.3