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/controller/DataReportingController.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 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..edb24e5 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
@@ -6,6 +6,8 @@
 import cn.hutool.core.text.csv.CsvReader;
 import cn.hutool.core.text.csv.CsvRow;
 import cn.hutool.core.text.csv.CsvUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
@@ -30,6 +32,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")
@@ -85,6 +90,9 @@
     public Result selectFansSubmitList(@RequestBody Map<String, Object> data) {
         Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
         FansSubmit fansSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FansSubmit.class);
+        if (ObjectUtil.isNotEmpty(fansSubmit.getCreateTime())){
+            fansSubmit.setCreateTime(fansSubmit.getCreateTime().plusDays(1));
+        }
         return Result.success(fansSubmitService.selectFansSubmitList(page, fansSubmit));
     }
 
@@ -111,6 +119,9 @@
     public Result selectFinanceSubmitList(@RequestBody Map<String, Object> data) {
         Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
         FinanceSubmit financeSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FinanceSubmit.class);
+        if (ObjectUtil.isNotEmpty(financeSubmit.getCreateTime())){
+            financeSubmit.setCreateTime(financeSubmit.getCreateTime().plusDays(1));
+        }
         return Result.success(financeSubmitService.selectFinanceSubmitList(page, financeSubmit));
     }
 
@@ -200,7 +211,7 @@
                         break;
                 }
             }
-            list.add(reporting);
+            if(reporting.getAccountConsumption().compareTo(BigDecimal.ZERO) > 0) list.add(reporting);
         }
         dataReportingService.addDataReporting(list, format, param);
         return Result.success();
@@ -259,6 +270,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 +325,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++) {
@@ -376,6 +389,13 @@
         return Result.success(dataReportingService.selectDataReportingForCreateUserNames(time));
     }
 
+    @ApiOperation(value = "鑾峰彇椤圭洰鏁版嵁缁熻鐨勯」鐩瓫閫夐」")
+    @PostMapping("/selectDataReportingForProduct")
+    @ValueAuth
+    public Result selectDataReportingForProduct(String time) {
+        return Result.success(dataReportingService.selectDataReportingForProduct(time));
+    }
+
     @ApiOperation(value = "鑾峰彇寰俊鍙峰垪琛�")
     @GetMapping("/selectVxs")
     @ValueAuth
@@ -389,4 +409,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();
+    }
 }

--
Gitblit v1.9.3