楚江erp：1、台账明细搜索调整；2、台账数据拆分bug修复

 package com.lframework.xingyun.sc.bo.ledger.receipt;
 package com.lframework.xingyun.sc.bo.ledger.receipt;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
@@ -10,6 +13,7 @@ import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 
 import lombok.Data;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -36,6 +40,18 @@ public class GetReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private String customerShortId;
     private String customerShortId;
 
 
     /**
     /**
+     * 客户简称
+     */
+    @ApiModelProperty("客户简称")
+    private String customerShortName;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty("客户类型")
+    private String customerType;
+
+    /**
      * 额度
      * 额度
      */
      */
     @ApiModelProperty("额度")
     @ApiModelProperty("额度")
@@ -54,24 +70,48 @@ public class GetReceiptLedgerInfoBo 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("厂别")
@@ -236,6 +276,13 @@ public class GetReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
 
 
     @Override
     @Override
     protected void afterInit(ReceiptLedgerInfo dto) {
     protected void afterInit(ReceiptLedgerInfo dto) {
-
+        if (StringUtils.isNotBlank(dto.getCustomerType())) {
+            // 获取客户类型（数据字典）
+            SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+            SysDataDicItem dicItem = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", dto.getCustomerType());
+            if (dicItem != null) {
+                this.customerType = dicItem.getName();
+            }
+        }
     }
     }
 }
 }

@@ -50,9 +50,11 @@ 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);
+        if (vo.getTabNum() != null && vo.getCreateYear() != null) {
+            String startTime = CommonUtil.convertToMonthDate(vo.getCreateYear(), vo.getTabNum(), 1, 0, 0, 0);
+            String endTime = CommonUtil.convertToMonthDate(vo.getCreateYear(), vo.getTabNum(), 0, 23, 59, 59);
+            vo.setCreateTimeStart(startTime);
+            vo.setCreateTimeEnd(endTime);
         }
         }
         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();

@@ -7,6 +7,8 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -20,6 +22,7 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ReceiptLedgerInfoMapper;
 import com.lframework.xingyun.sc.mappers.ReceiptLedgerInfoMapper;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
@@ -27,13 +30,23 @@ import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedgerInfoMapper, ReceiptLedgerInfo> implements ReceiptLedgerInfoService {
 public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedgerInfoMapper, ReceiptLedgerInfo> implements ReceiptLedgerInfoService {
 
 
+
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
+
+
+
     @Override
     @Override
     public PageResult<ReceiptLedgerInfo> query(Integer pageIndex, Integer pageSize, QueryReceiptLedgerInfoVo vo) {
     public PageResult<ReceiptLedgerInfo> query(Integer pageIndex, Integer pageSize, QueryReceiptLedgerInfoVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageIndex);
@@ -47,8 +60,21 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
 
 
     @Override
     @Override
     public List<ReceiptLedgerInfo> query(QueryReceiptLedgerInfoVo vo) {
     public List<ReceiptLedgerInfo> query(QueryReceiptLedgerInfoVo vo) {
-
-        return getBaseMapper().query(vo);
+        List<ReceiptLedgerInfo> infoList = getBaseMapper().query(vo);
+        if (CollectionUtils.isEmpty(infoList)) {
+            return Collections.emptyList();
+        }
+        // 获取客户类型（数据字典）
+        List<SysDataDicItem> enterpriseTypeList = sysDataDicItemService.findByDicCode("ENTERPRISE_TYPE");
+        Map<String, String> enterpriseTypeMap = enterpriseTypeList.stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
+        for (ReceiptLedgerInfo info : infoList) {
+            String customerType = info.getCustomerType();
+            String enterpriseType = enterpriseTypeMap.get(customerType);
+
+            info.setCustomerType(enterpriseType);
+        }
+        return infoList;
     }
     }
 
 
     @Override
     @Override
@@ -125,12 +151,10 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             throw new DefaultClientException("应收款台账明细不存在！");
             throw new DefaultClientException("应收款台账明细不存在！");
         }
         }
         LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
         LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
-                .set(ReceiptLedgerInfo::getDelFlag, 1)
+                .set(ReceiptLedgerInfo::getDelFlag, true)
                 .eq(ReceiptLedgerInfo::getId, id);
                 .eq(ReceiptLedgerInfo::getId, id);
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
-        OpLogUtil.setVariable("id", data.getId());
-        OpLogUtil.setExtra(id);
     }
     }
 
 
     /**
     /**

@@ -7,8 +7,10 @@ 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.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.Year;
 import java.time.Year;
+import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
@@ -91,15 +93,18 @@ public class CommonUtil {
      * @param month 月份数字 (1-12)
      * @param month 月份数字 (1-12)
      * @return 格式化的日期时间字符串，如 "2025-01-01 00:00:00"
      * @return 格式化的日期时间字符串，如 "2025-01-01 00:00:00"
      */
      */
-    public static String convertToMonthDate(int month) {
+    public static String convertToMonthDate(int year, int month, int day, int hour, int minute, int second) {
         // 验证月份是否有效
         // 验证月份是否有效
         if (month < 1 || month > 12) {
         if (month < 1 || month > 12) {
             throw new DefaultClientException("月份必须在 1-12 之间，当前值: " + month);
             throw new DefaultClientException("月份必须在 1-12 之间，当前值: " + month);
         }
         }
-        // 获取当前年份
-        int currentYear = Year.now().getValue();
-        // 创建当月第一天的日期时间
-        LocalDateTime dateTime = LocalDateTime.of(currentYear, month, 1, 0, 0, 0);
+        if (day == 0) {
+            // 获取最后一天
+            YearMonth yearMonth = YearMonth.of(year, month);
+            LocalDate lastDay = yearMonth.atEndOfMonth();
+            day = lastDay.getDayOfMonth();
+        }
+        LocalDateTime dateTime = LocalDateTime.of(year, month, day, hour, minute, second);
         // 格式化为字符串
         // 格式化为字符串
         return dateTime.format(FORMATTER);
         return dateTime.format(FORMATTER);
     }
     }

@@ -61,8 +61,15 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
     private Integer tabNum;
     private Integer tabNum;
 
 
     /**
     /**
-     * 创建时间
+     * 创建时间范围
      */
      */
-    @ApiModelProperty("创建时间")
-    private String createTime;
+    @ApiModelProperty("创建时间范围")
+    private String createTimeStart;
+    private String createTimeEnd;
+
+    /**
+     * 年份
+     */
+    @ApiModelProperty("年份")
+    private Integer createYear;
 }
 }

@@ -105,8 +105,11 @@
             <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 test="vo.createTimeStart != null and vo.createTimeStart != ''">
+                AND tb.create_time >= #{vo.createTimeStart}
+            </if>
+            <if test="vo.createTimeEnd != null and vo.createTimeEnd != ''">
+                AND tb.create_time &lt;= #{vo.createTimeEnd}
             </if>
             </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}, '%')
@@ -138,7 +141,7 @@
         processed_date,
         processed_date,
         actual_returned_date,
         actual_returned_date,
         returned_amount,
         returned_amount,
-        actual_returned_amount
+        actual_returned_amount,
         end_account_receivable,
         end_account_receivable,
         apply_status,
         apply_status,
         coordinate_date,
         coordinate_date,
@@ -148,7 +151,6 @@
         fourth_coordinate_date,
         fourth_coordinate_date,
         fifth_coordinate_date,
         fifth_coordinate_date,
         description,
         description,
-        spilt,
         create_by_id,
         create_by_id,
         update_by_id,
         update_by_id,
         create_time,
         create_time,
@@ -175,14 +177,13 @@
             #{item.actualReturnedAmount},
             #{item.actualReturnedAmount},
             #{item.endAccountReceivable},
             #{item.endAccountReceivable},
             #{item.applyStatus},
             #{item.applyStatus},
-            #{item.coordinateAate},
+            #{item.coordinateDate},
             #{item.remark},
             #{item.remark},
             #{item.secondCoordinateDate},
             #{item.secondCoordinateDate},
             #{item.thirdCoordinateDate},
             #{item.thirdCoordinateDate},
             #{item.fourthCoordinateDate},
             #{item.fourthCoordinateDate},
             #{item.fifthCoordinateDate},
             #{item.fifthCoordinateDate},
             #{item.description},
             #{item.description},
-            #{item.spilt},
             #{item.createById},
             #{item.createById},
             #{item.updateById},
             #{item.updateById},
             #{item.createTime},
             #{item.createTime},