Преглед изворни кода

业务员收支明明细导出功能完善

lipf пре 3 месеци
родитељ
комит
01f3bd08f7

+ 16 - 0
commons/src/main/java/com/jzg/commons/util/DateTimeUtils.java

@@ -1,5 +1,7 @@
 package com.jzg.commons.util;
 
+import cn.hutool.core.util.StrUtil;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -8,6 +10,7 @@ import java.time.format.DateTimeParseException;
 public class DateTimeUtils {
 
     private static final String pattern = "yyyy-MM-dd HH:mm:ss";
+    private static final String patternYMD = "yyyyMMdd";
 
     // 标准日期格式
     private static final DateTimeFormatter DATE_FORMATTER =
@@ -92,4 +95,17 @@ public class DateTimeUtils {
     public static String getFormatTime(String format) {
         return LocalDateTime.now().format(DateTimeFormatter.ofPattern(format));
     }
+
+    /**
+     * 格式化localDate为yyyyMMdd格式
+     * @author lipf
+     * @date 2026/6/9 18:06
+     */
+    public static String fmtDate(LocalDate date) {
+        if(date == null){
+            return StrUtil.EMPTY;
+        }
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(patternYMD);
+        return formatter.format(date);
+    }
 }

+ 2 - 2
tenant/organization/src/main/java/com/jzg/organization/service/SysAmountAuditingService.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 /**
 * @author dongxin
 * @description 针对表【sys_amount_auditing(提现申请表)】的数据库操作Service
-* @createDate 2025-07-11 11:05:25
+* @date 2025-07-11 11:05:25
 */
 public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
 
@@ -97,7 +97,7 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
     /**
      * 导出业务员收入支出明显
      * param ywyIOParam 导出条件, 包含开始日期,结束日期
-     * @return
+     * @return 要导出文件在minio上面的地址
      */
     String exportYwyIORecs(YwyIOParam ywyIOParam);
 

+ 3 - 2
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -21,6 +21,7 @@ import com.jzg.commons.entity.vo.AmountAuditVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.BigDecimalUtil;
+import com.jzg.commons.util.DateTimeUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.service.*;
@@ -442,7 +443,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
      * 导出业务员收入支出明显
      *
      * param ywyIOParam 导出条件, 包含开始日期,结束日期
-     * @return String
+     * @return String 要导出文件在minio上面的地址
      */
     @Override
     public String exportYwyIORecs(YwyIOParam ywyIOParam) {
@@ -453,7 +454,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             SysUserAccountChangeLog sysUserAccountChangeLog = changeLogs.get(0);
             userName = sysUserAccountChangeLog.getUserName();
         }
-        String suffix = String.join("-",Objects.toString(userName,""),Objects.toString(ywyIOParam.getBeginDate(),null) , Objects.toString(ywyIOParam.getEndDate(),null));
+        String suffix = String.join("-",Objects.toString(userName,""), DateTimeUtils.fmtDate(ywyIOParam.getBeginDate()),DateTimeUtils.fmtDate(ywyIOParam.getEndDate()));
         // 调用动态导出
         return exportBaseService.upLoadFile(
                 SysUserAccountChangeLog.class,