diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index 5818b906..a463c953 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -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 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天 "); }