diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java index 54dc52fd..7e213ee9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java @@ -192,7 +192,7 @@ public class ProcessEsAnnualReport implements Serializable { @ApiModelProperty(value = "草稿计划完成日期") private Date draftPlannedCompleteDate; - @Excel(name = "草稿计划完成日期", width = 20, orderNum = "12") + @Excel(name = "*草稿计划完成日期", width = 20, orderNum = "12") @TableField(exist = false) private String draftPlannedCompleteDateString; @@ -204,7 +204,7 @@ public class ProcessEsAnnualReport implements Serializable { @ApiModelProperty(value = "征求意见稿计划完成日期") private Date solicitationDraftPlanCompleteDate; - @Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "13") + @Excel(name = "*征求意见稿计划完成日期", width = 24, orderNum = "13") @TableField(exist = false) private String solicitationDraftPlanCompleteDateString; @@ -216,7 +216,7 @@ public class ProcessEsAnnualReport implements Serializable { @ApiModelProperty(value = "计划报批日期") private Date planApprovalDate; - @Excel(name = "计划报批日期", width = 15, orderNum = "14") + @Excel(name = "*计划报批日期", width = 15, orderNum = "14") @TableField(exist = false) private String planApprovalDateString; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index d9178284..9bb4d998 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -467,9 +467,9 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl 0) { errorMsgs.add(errMsgHeader.append(errMsg).toString()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java index 567c52bc..92a1fd8c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java @@ -364,13 +364,19 @@ public class ExcelUtils { return matcher.find(); } + public String validSingleDateMustInput(String date, String name) { + if (StrUtil.isBlank(date)) { + return "'" + name + "'不能为空。"; + } + return this.validSingleDate(date, name); + } + public String validSingleDate(String date, String name) { if (importUtil.singleDateValid(date)) { return ""; } else { return "'" + name + "'格式错误。"; } - } public String validPartName(String value, List listDict) { diff --git a/laws-modules/src/main/resources/excelTemplate/es-annual-init.xlsx b/laws-modules/src/main/resources/excelTemplate/es-annual-init.xlsx index 0b3eed8c..c365c3d1 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/es-annual-init.xlsx and b/laws-modules/src/main/resources/excelTemplate/es-annual-init.xlsx differ diff --git a/laws-modules/src/main/resources/excelTemplate/es-annual-report.xlsx b/laws-modules/src/main/resources/excelTemplate/es-annual-report.xlsx index 7002a9e8..1c3764f1 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/es-annual-report.xlsx and b/laws-modules/src/main/resources/excelTemplate/es-annual-report.xlsx differ