楚江erp：台账明细列表增加月份查询

@@ -37,6 +37,18 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private String customerShortId;
     private String customerShortId;
 
 
     /**
     /**
+     * 客户简称
+     */
+    @ApiModelProperty("客户简称")
+    private String customerShortName;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty("客户类型")
+    private String customerType;
+
+    /**
      * 额度
      * 额度
      */
      */
     @ApiModelProperty("额度")
     @ApiModelProperty("额度")
@@ -55,24 +67,48 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private String deptId;
     private String deptId;
 
 
     /**
     /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
      * 区域ID
      * 区域ID
      */
      */
     @ApiModelProperty("区域ID")
     @ApiModelProperty("区域ID")
     private String region;
     private String region;
 
 
     /**
     /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
+    /**
      * 备货单位ID
      * 备货单位ID
      */
      */
     @ApiModelProperty("备货单位ID")
     @ApiModelProperty("备货单位ID")
     private String stockUpCompanyId;
     private String stockUpCompanyId;
 
 
     /**
     /**
+     * 备货单位名称
+     */
+    @ApiModelProperty("备货单位名称")
+    private String stockUpCompanyName;
+
+    /**
      * 客户ID
      * 客户ID
      */
      */
     @ApiModelProperty("客户ID")
     @ApiModelProperty("客户ID")
     private String customerId;
     private String customerId;
 
 
     /**
     /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
      * 厂别
      * 厂别
      */
      */
     @ApiModelProperty("厂别")
     @ApiModelProperty("厂别")
@@ -234,5 +270,10 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
         if (StringUtils.isNotBlank(dto.getParentId())) {
         if (StringUtils.isNotBlank(dto.getParentId())) {
             this.spilt = true;
             this.spilt = true;
         }
         }
+        if ("XC".equals(dto.getFactoryType())) {
+            this.factoryType = "安徽楚江科技新材料股份有限公司";
+        } else if ("GJ".equals(dto.getFactoryType())) {
+            this.factoryType = "安徽楚江高精铜带有限公司";
+        }
     }
     }
 }
 }

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.controller.ledger;
 
 
 import com.lframework.xingyun.sc.bo.ledger.receipt.GetReceiptLedgerInfoBo;
 import com.lframework.xingyun.sc.bo.ledger.receipt.GetReceiptLedgerInfoBo;
 import com.lframework.xingyun.sc.bo.ledger.receipt.QueryReceiptLedgerInfoBo;
 import com.lframework.xingyun.sc.bo.ledger.receipt.QueryReceiptLedgerInfoBo;
+import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
@@ -49,6 +50,10 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
     @HasPermission({"account-manage:ledger-detail:query"})
     @HasPermission({"account-manage:ledger-detail:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryReceiptLedgerInfoBo>> query(@Valid QueryReceiptLedgerInfoVo vo) {
     public InvokeResult<PageResult<QueryReceiptLedgerInfoBo>> query(@Valid QueryReceiptLedgerInfoVo vo) {
+        if (vo.getTabNum() != null) {
+            String dateTime = CommonUtil.convertToMonthDate(vo.getTabNum());
+            vo.setCreateTime(dateTime);
+        }
         PageResult<ReceiptLedgerInfo> pageResult = receiptLedgerInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<ReceiptLedgerInfo> pageResult = receiptLedgerInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
         List<ReceiptLedgerInfo> dataList = pageResult.getDatas();
         List<ReceiptLedgerInfo> dataList = pageResult.getDatas();
         List<QueryReceiptLedgerInfoBo> results = null;
         List<QueryReceiptLedgerInfoBo> results = null;

 package com.lframework.xingyun.sc.utils;
 package com.lframework.xingyun.sc.utils;
 
 
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 
 
 import java.io.*;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.Year;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
@@ -14,6 +18,9 @@ import java.util.List;
 public class CommonUtil {
 public class CommonUtil {
 
 
 
 
+    // 预定义格式器
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
 
 
     /**
     /**
      * 深度拷贝
      * 深度拷贝
@@ -77,4 +84,23 @@ public class CommonUtil {
         return batches;
         return batches;
     }
     }
 
 
+
+    /**
+     * 将月份数字转换为当前年份对应月份的第一天
+     *
+     * @param month 月份数字 (1-12)
+     * @return 格式化的日期时间字符串，如 "2025-01-01 00:00:00"
+     */
+    public static String convertToMonthDate(int month) {
+        // 验证月份是否有效
+        if (month < 1 || month > 12) {
+            throw new DefaultClientException("月份必须在 1-12 之间，当前值: " + month);
+        }
+        // 获取当前年份
+        int currentYear = Year.now().getValue();
+        // 创建当月第一天的日期时间
+        LocalDateTime dateTime = LocalDateTime.of(currentYear, month, 1, 0, 0, 0);
+        // 格式化为字符串
+        return dateTime.format(FORMATTER);
+    }
 }
 }

@@ -52,4 +52,17 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
      */
      */
     @ApiModelProperty("客户名称")
     @ApiModelProperty("客户名称")
     private String customerName;
     private String customerName;
+
+    /**
+     * tab页
+     * 月份
+     */
+    @ApiModelProperty("tab页")
+    private Integer tabNum;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private String createTime;
 }
 }

@@ -105,6 +105,9 @@
             <if test="vo.customerId != null and vo.customerId != ''">
             <if test="vo.customerId != null and vo.customerId != ''">
                 AND tb.customer_id = #{vo.customerId}
                 AND tb.customer_id = #{vo.customerId}
             </if>
             </if>
+            <if test="vo.createTime != null and vo.createTime != ''">
+                AND tb.create_time >= #{vo.createTime}
+            </if>
             <if test="vo.customerName != null and vo.customerName != ''">
             <if test="vo.customerName != null and vo.customerName != ''">
                 AND oc.name LIKE CONCAT('%', #{vo.customerName}, '%')
                 AND oc.name LIKE CONCAT('%', #{vo.customerName}, '%')
             </if>
             </if>