update:修改bug

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java

@@ -79,6 +79,6 @@ public class AnnualMemberProjectController extends JeroController<TbMemberProjec
             annualMemberProjectExcelVO.setEffectiveDateStr(item.getEffectiveDateStr());
             exportList.add(annualMemberProjectExcelVO);
         }
-        return super.exportListXls(exportList, AnnualMemberProjectExcelVO.class, "年度会员维护表");
+        return super.exportListXls(exportList, AnnualMemberProjectExcelVO.class, "会员信息统计");
     }
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java

@@ -56,10 +56,10 @@ public class IAnnualMemberProjectService {
             queryWrapper.eq("year(effective_date)",effectiveDate.year());
             queryWrapper.eq("month(effective_date)",effectiveDate.month()+1);
         }
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!rolePermissionService.getRolePermission("memberStatistic:search")) {
+//        if (!rolePermissionService.getRolePermission("memberStatistic:search")) {
-            queryWrapper.eq("tmp.director_id",sysUser.getId());
+//            queryWrapper.eq("tmp.director_id",sysUser.getId());
-        }
+//        }
         return queryWrapper;
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java

@@ -283,34 +283,17 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 				String estimatedArrivalDateStr = subitemExcel.getEstimatedArrivalDate();
 				if (StringUtils.isNotBlank(estimatedArrivalDateStr)) {
 					try {
+						DateTimeFormatter formatter;
 						LocalDate parsedDate;
-						if (StringUtils.isNumeric(estimatedArrivalDateStr)) {
+						if (estimatedArrivalDateStr.matches("\\d{4}-\\d{1,2}")) {
-							// 如果是数字格式的日期，将其转换为 LocalDate
+							// 处理 yyyy-MM 格式
-							double dateAsDouble = Double.parseDouble(estimatedArrivalDateStr);
+							estimatedArrivalDateStr = estimatedArrivalDateStr + "-01";
-							LocalDate baseDate = LocalDate.of(1900, 1, 1).minusDays(2);
+							formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-							parsedDate = baseDate.plusDays((long) dateAsDouble);
 						} else {
-							DateTimeFormatter formatter;
+							throw new DateTimeParseException("日期格式错误", estimatedArrivalDateStr, 0);
-							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)); // 设置正确格式的日期到对象中
 						}
+						parsedDate = LocalDate.parse(estimatedArrivalDateStr, formatter);
+						subitem.setEstimatedArrivalDate(java.sql.Date.valueOf(parsedDate)); // 设置正确格式的日期到对象中
 					} catch (Exception e) {
 						errorMessage.add("第" + errorRowNum + "行：" + "预估到账日期格式错误");
 					}

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;
 
     /**