From 03e2f3e56bf7240d6702626c50a04d3291a7a044 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Wed, 10 Jul 2024 10:16:38 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=9A=84=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CouncilMeetingSituationController.java    |  8 ++++
 .../WorkGroupMeetingSituationController.java  |  8 ++++
 .../meeting/entity/PayMeetingSituation.java   |  5 ++
 .../ITbMemberProjectSubitemService.java       | 46 +++++++++++++++++--
 .../vo/TbMemberProjectSubitemExcelImport.java |  4 +-
 .../jero/project/entity/PayCommonProject.java |  1 +
 6 files changed, 66 insertions(+), 6 deletions(-)

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<PayMeeting
             } else {
                 meetingSituation.setIdentification(PayProjectCommon.NO);
             }
+            Date estimatedArrivalDate = meetingSituation.getEstimatedArrivalDate();
+            if (estimatedArrivalDate != null) {
+                SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM");
+                String newDate = targetFormat.format(estimatedArrivalDate);
+                meetingSituation.setEstimatedArrivalDateStr(newDate);
+            }
         }
         return Result.OK(pageList);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
index 3894adf6..a486d374 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.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;
 import java.util.stream.Collectors;
@@ -87,6 +89,12 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
             }else {
                 meetingSituation.setIdentification(PayProjectCommon.NO);
             }
+            Date estimatedArrivalDate = meetingSituation.getEstimatedArrivalDate();
+            if (estimatedArrivalDate != null) {
+                SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM");
+                String newDate = targetFormat.format(estimatedArrivalDate);
+                meetingSituation.setEstimatedArrivalDateStr(newDate);
+            }
         }
         return Result.OK(pageList);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 0da48f48..e4b99893 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -586,4 +586,9 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "预计到账日期")
     private Date estimatedArrivalDate;
 
+    /**预计到账日期*/
+    @ApiModelProperty(value = "预计到账日期")
+    @TableField(exist = false)
+    private String estimatedArrivalDateStr;
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 22188dfa..8cbde2f1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -1,5 +1,8 @@
 package com.jero.member.service;
 import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.*;
 
 import cn.hutool.core.date.DateField;
@@ -275,10 +278,45 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 				subitem.setAmountReceivable(new BigDecimal(amountReceivable));
 			}
 
-			//预估到账日期
-			if (ValidUtil.checkErrorList(errorList,"预估到账日期")) {
-				String estimatedArrivalDate = subitemExcel.getEstimatedArrivalDate();
-				subitem.setEstimatedArrivalDate(DateUtil.parseDate(estimatedArrivalDate));
+			// 预估到账日期
+			if (ValidUtil.checkErrorList(errorList, "预估到账日期")) {
+				String estimatedArrivalDateStr = subitemExcel.getEstimatedArrivalDate();
+				if (StringUtils.isNotBlank(estimatedArrivalDateStr)) {
+					try {
+						LocalDate parsedDate;
+						if (StringUtils.isNumeric(estimatedArrivalDateStr)) {
+							// 如果是数字格式的日期，将其转换为 LocalDate
+							double dateAsDouble = Double.parseDouble(estimatedArrivalDateStr);
+							LocalDate baseDate = LocalDate.of(1900, 1, 1).minusDays(2);
+							parsedDate = baseDate.plusDays((long) dateAsDouble);
+						} else {
+							DateTimeFormatter formatter;
+							if (estimatedArrivalDateStr.matches("\\d{4}-\\d{1,2}")) {
+								// 处理 yyyy-MM 格式
+								estimatedArrivalDateStr = estimatedArrivalDateStr + "-01";
+								formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+							} else if (estimatedArrivalDateStr.matches("\\d{4}-\\d{1,2}-\\d{1,2}")) {
+								// 处理 yyyy-MM-dd 格式
+								formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+							} else {
+								throw new DateTimeParseException("日期格式错误", estimatedArrivalDateStr, 0);
+							}
+							parsedDate = LocalDate.parse(estimatedArrivalDateStr, formatter);
+						}
+
+						// 增加日期合理性校验，比如判断年份范围
+						int year = parsedDate.getYear();
+						if (year < 1900 || year > 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;
 }