diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java index d9cc224f..3c2ef6bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java @@ -79,6 +79,6 @@ public class AnnualMemberProjectController extends JeroController 2100) { - errorMessage.add("第" + errorRowNum + "行:" + "预估到账日期年份超出合理范围"); - } else { - subitem.setEstimatedArrivalDate(java.sql.Date.valueOf(parsedDate)); // 设置正确格式的日期到对象中 + throw new DateTimeParseException("日期格式错误", estimatedArrivalDateStr, 0); } + parsedDate = LocalDate.parse(estimatedArrivalDateStr, formatter); + subitem.setEstimatedArrivalDate(java.sql.Date.valueOf(parsedDate)); // 设置正确格式的日期到对象中 } catch (Exception e) { errorMessage.add("第" + errorRowNum + "行:" + "预估到账日期格式错误"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java index 098c1283..dd0ee498 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java @@ -22,21 +22,21 @@ public class AnnualMemberProjectExcelVO { @ApiModelProperty(value = "会员编号") private String memberNo; - /**会员状态*/ - @Excel(name = "会员状态", width = 15, dicCode = "member_status") - @ApiModelProperty(value = "会员状态") - @Dict(dicCode = "member_status") - private Integer memberStatus; - /**会员联系人*/ @ApiModelProperty(value = "企业联系人") @Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") private String liaisonManId; + /**会员状态*/ + @Excel(name = "会员状态", width = 15, dicCode = "member_status") + @ApiModelProperty(value = "会员状态") + @Dict(dicCode = "member_status") + private Integer memberStatus; + /** 生效日期 */ @ApiModelProperty(value = "生效日期") - @Excel(name = "会员单位", width = 20) + @Excel(name = "生效日期", width = 20) private String effectiveDateStr; /**