From 2b0e875855e781c16e32187aa5552ee12ddcefa0 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 12:11:55 +0800
Subject: [PATCH] #产出计算
---
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 2 +-
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
index b9107ac..7d4db6c 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -68,7 +68,7 @@
private String planCode;
@ApiModelProperty(value = "璁″垝瀹屾垚鏃ユ湡")
- @ExcelColumn(name="璁″垝鏃ユ湡",index = 4,width =15)
+ @ExcelColumn(name="璁″垝瀹屾垚鏃ユ湡",index = 4,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
@ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
index 4885ee4..a5f024f 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -398,7 +398,7 @@
}
Date pDate = DateUtil.getDateFromString(DateUtil.getShortTime(p.getPlanDate()) +" 00:00:00");
- Date nDate = DateUtil.getDateFromString(DateUtil.getShortTime(DateUtil.getCurrentDate()) +" 00:00:00");
+ Date nDate = DateUtil.getDateFromString(DateUtil.getShortTime(DateUtil.getCurrentDate()) +" 23:59:59");
if( nDate.getTime() > pDate.getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璁″垝鐢熶骇鏃ユ湡蹇呴』涓轰粖澶╀互鍚庣殑鏃ユ湡锛�");
}
--
Gitblit v1.9.3