From 6289ae44a4c24d431e871a9497017ffa94cef6c7 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期六, 06 四月 2024 17:50:35 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java | 1 -
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 8 ++++++++
data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java | 2 --
3 files changed, 8 insertions(+), 3 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 c21f0fd..e6f7da5 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;
@@ -88,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));
}
@@ -114,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));
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
index 4960526..5cbcc36 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
@@ -72,7 +72,6 @@
@ApiModelProperty("鐧昏鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(6)
private LocalDateTime createTime;
/**
*
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
index 9db0b2f..aea509c 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
@@ -89,13 +89,11 @@
@ApiModelProperty("鐧昏鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(6)
private LocalDateTime createTime;
/**
*
*/
@ApiModelProperty("绯荤粺鏃堕棿")
- @ValueTableShow(0)
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
--
Gitblit v1.9.3