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

feat: 80011 年度制修订-各部门主动上报：模板下载这三个日期需要改成必填

Browse Source
This commit is contained in:
mzaxd
2024-01-03 11:53:28 +08:00
parent fb9f8fe6c7
commit 3856a58bf5
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+3 -3
View File
@@ -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;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+3 -3
View File
@@ -467,9 +467,9 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
errMsg.append(excelUtils.validStandardSystem(standardSystem, listDict));
errMsg.append(excelUtils.validStandardType(standardType, listDict));
errMsg.append(excelUtils.validStandardClassification(standardClassification, listDict));
errMsg.append(excelUtils.validSingleDate(draftPlannedCompleteDateString, "草稿计划完成日期"));
errMsg.append(excelUtils.validSingleDate(solicitationDraftPlanCompleteDateString, "征求意见稿计划完成日期"));
errMsg.append(excelUtils.validSingleDate(planApprovalDateString, "计划报批日期"));
errMsg.append(excelUtils.validSingleDateMustInput(draftPlannedCompleteDateString, "草稿计划完成日期"));
errMsg.append(excelUtils.validSingleDateMustInput(solicitationDraftPlanCompleteDateString, "征求意见稿计划完成日期"));
errMsg.append(excelUtils.validSingleDateMustInput(planApprovalDateString, "计划报批日期"));
// 如果数据有问题，则将提示信息添加到 errorMsgs 中
if (errMsg.length() > 0) {
errorMsgs.add(errMsgHeader.append(errMsg).toString());
laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+7 -1
View File
@@ -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<SysDictItemCore> listDict) {