diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java index 5b6874bf..2da291b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java @@ -29,7 +29,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -81,6 +83,12 @@ public class CouncilMeetingSituationController extends JeroController 2100) { + errorMessage.add("第" + errorRowNum + "行:" + "预估到账日期年份超出合理范围"); + } else { + subitem.setEstimatedArrivalDate(java.sql.Date.valueOf(parsedDate)); // 设置正确格式的日期到对象中 + } + } catch (Exception e) { + errorMessage.add("第" + errorRowNum + "行:" + "预估到账日期格式错误"); + } + } else { + errorMessage.add("第" + errorRowNum + "行:" + "预估到账日期不能为空"); + } } String paymentMethod = subitemExcel.getPaymentMethod(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java index 738175d8..aff90855 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java @@ -61,9 +61,9 @@ public class TbMemberProjectSubitemExcelImport { private String amountReceivable; /**预估到账日期*/ +// @NotBlank(message = "预估到账日期不能为空") +// @Pattern(regexp = "^\\d{4}-\\d{1,2}-\\d{1,2}$",message = "预估到账日期格式错误") @ApiModelProperty(value = "预估到账日期") - @NotBlank(message = "预估到账日期不能为空") - @Pattern(regexp = "^\\d{4}-\\d{1,2}-\\d{1,2}$",message = "预估到账日期格式错误") @Excel(name = "预估到账日期", width = 15) private String estimatedArrivalDate; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 0af0cc9e..a5ec7a14 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -380,5 +380,6 @@ public class PayCommonProject implements Serializable { private String equityStatus; @ApiModelProperty(value = "自定义排序顺序") + @TableField(exist = false) private Integer sortNo; }