From 3af951146aabb69d7857daf11a4bdef21c7ef77e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 22 五月 2024 09:54:29 +0800
Subject: [PATCH] 功能调整
---
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 0329831..d45ce6e 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
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
+import cn.hutool.core.lang.Console;
import cn.hutool.core.text.csv.CsvData;
import cn.hutool.core.text.csv.CsvReader;
import cn.hutool.core.text.csv.CsvRow;
@@ -272,6 +273,7 @@
@ApiOperation(value = "瀵煎叆杩涚矇涓婃姤鍒楄〃")
@PostMapping("/inputFansSubmitCsv")
+ @Transactional(rollbackFor = Exception.class)
public Result<?> inputFansSubmitCsv(@RequestParam("file") MultipartFile file) throws IOException {
List<FansSubmit> fansSubmitLists = new ArrayList<>();
List<FansSubmit> fansSubmitList = new ArrayList<>();
@@ -280,9 +282,13 @@
ExcelUtil.readBySax(file.getInputStream(), 0, (i, l, list) -> {
LocalDateTime date = null;
try {
- date = LocalDateTime.parse((list.get(0) + "").replace(" ", "T"));
+ date = LocalDateTime.parse((list.get(0) + "").replace(" ", "T")).plusDays(1);
dates.add(date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+" 00:00:00");
- } catch (Exception e) {}
+ } catch (Exception e) {
+ if(!(l == 0 || l == 1 || l == 2)){
+ return;
+ }
+ }
if (l == 0 || l == 1 || l == 2
|| date.compareTo(LocalDateTime.now()) < 1) {
for (int i1 = 1; i1 < list.size(); i1++) {
@@ -328,7 +334,11 @@
fansSubmit.setVx(str);
break;
case "杩涚矇":
- fansSubmit.setFansAdd(Integer.parseInt(str));
+ try {
+ fansSubmit.setFansAdd(Integer.parseInt(str));
+ }catch (Exception e){
+ fansSubmit.setFansAdd(0);
+ }
break;
}
}
@@ -355,7 +365,7 @@
fansSubmit.setVx(str);
}
}else{
- fansSubmit.setCreateTime(date.plusDays(1));
+ fansSubmit.setCreateTime(date);
fansSubmit.setFansAdd((str == null || str.equals("")) ? 0 : Integer.parseInt(str));
}
return product;
--
Gitblit v1.9.3