ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 78259

Browse Source 
企标--导入--实施日期没有限制大于发布日期15天
This commit is contained in:
mzaxd
2023-11-08 08:57:59 +08:00
parent 6bc0e01a41
commit bf304c975c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+6 -6
View File
@@ -92,7 +92,7 @@ public class ImportUtil {
String standardNumber = "";
String standardClass = "";
String yearNumber = "";
Date publishDate = null;
Date releaseDate = null;
Date implementationDate = null;
StringBuilder errMsg = new StringBuilder("第" + line + "行");
Map<String, Object> parameterMap = new HashMap<>();
@@ -385,8 +385,8 @@ public class ImportUtil {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
} else {
if (tag.getDbFieldName().equals("publish_date")) {
publishDate = this.convertDate(cellValue);
if (tag.getDbFieldName().equals("release_date")) {
releaseDate = this.convertDate(cellValue);
}
if (tag.getDbFieldName().equals("implementation_date")) {
implementationDate = this.convertDate(cellValue);
@@ -431,11 +431,11 @@ public class ImportUtil {
}
}
// 判断实施日期是否大于发布日期15天
if (publishDate != null && implementationDate != null) {
if (releaseDate != null && implementationDate != null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(implementationDate);
calendar.add(Calendar.DAY_OF_MONTH, 15);
if (publishDate.before(calendar.getTime())) {
calendar.add(Calendar.DAY_OF_MONTH, -15);
if (!releaseDate.before(calendar.getTime())) {
log.error("第" + line + "行的实施日期必须大于发布日期15天 ");
errMsg.append("第").append(line).append("行的实施日期必须大于发布日期15天 ");
}