楚江erp：台账报表相关接口开发

@@ -4,17 +4,14 @@ 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.ReceiptLedgerReportBo;
 import com.lframework.xingyun.sc.utils.CommonUtil;
-import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
+import com.lframework.xingyun.sc.vo.ledger.receipt.*;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
-import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
-import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
@@ -138,7 +135,7 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
     @ApiOperation("台账报表")
     @HasPermission({"account-manage:ledger-detail:query"})
     @GetMapping("/report")
-    public InvokeResult<PageResult<ReceiptLedgerReportBo>> report(@Valid QueryReceiptLedgerInfoVo vo) {
+    public InvokeResult<PageResult<ReceiptLedgerReportBo>> report(@Valid ReceiptLedgerReportVo vo) {
         PageResult<ReceiptLedgerReportBo> pageResult = receiptLedgerInfoService.report(getPageIndex(vo), getPageSize(vo), vo);
         return InvokeResultBuilder.success(pageResult);
     }

@@ -29,14 +29,11 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
-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.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ReceiptLedgerInfoMapper;
 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.QueryReceiptLedgerInfoVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -391,7 +388,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     }
 
     @Override
-    public PageResult<ReceiptLedgerReportBo> report(Integer pageIndex, Integer pageSize, QueryReceiptLedgerInfoVo vo) {
+    public PageResult<ReceiptLedgerReportBo> report(Integer pageIndex, Integer pageSize, ReceiptLedgerReportVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageSize);
         // 开启分页

@@ -4,6 +4,7 @@ import com.lframework.xingyun.sc.bo.ledger.receipt.ReceiptLedgerReportBo;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
+import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerReportVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -47,7 +48,7 @@ public interface ReceiptLedgerInfoMapper extends BaseMapper<ReceiptLedgerInfo> {
      * @param vo    查询条件
      * @return      List<ReceiptLedgerReportBo>
      */
-    List<ReceiptLedgerReportBo> report(@Param("vo") QueryReceiptLedgerInfoVo vo);
+    List<ReceiptLedgerReportBo> report(@Param("vo") ReceiptLedgerReportVo vo);
 
     /**
      * 根据客户简称统计欠款金额

@@ -2,13 +2,11 @@ package com.lframework.xingyun.sc.service.ledger;
 
 import com.lframework.xingyun.sc.bo.ledger.receipt.ReceiptLedgerReportBo;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
-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.*;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
-import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
-import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
+
 import java.util.List;
 
 /**
@@ -96,5 +94,5 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      * @param vo    查询条件
      * @return      PageResult<ReceiptLedgerReportBo>
      */
-    PageResult<ReceiptLedgerReportBo> report(Integer pageIndex, Integer pageSize, QueryReceiptLedgerInfoVo vo);
+    PageResult<ReceiptLedgerReportBo> report(Integer pageIndex, Integer pageSize, ReceiptLedgerReportVo vo);
 }

+package com.lframework.xingyun.sc.vo.ledger.receipt;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class ReceiptLedgerReportVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
+     * 欠款金额范围
+     */
+    @ApiModelProperty("欠款金额范围")
+    private String debtAmountScope;
+
+    /**
+     * 欠款起始值
+     */
+    @ApiModelProperty("欠款金额")
+    private BigDecimal debtStartValue;
+
+    /**
+     * 欠款结束值
+     */
+    @ApiModelProperty("欠款结束值")
+    private BigDecimal debtEndValue;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty("客户类型")
+    private String customerType;
+
+    /**
+     * 欠款状态
+     */
+    @ApiModelProperty("欠款状态")
+    private String debtStatus;
+}

@@ -208,12 +208,32 @@
                d.name as dept_name,
                tb.region,
                r.name as region_name,
-               max(cc.company_credit_limit) as quota
+               max(cc.company_credit_limit) as quota,
+               sum(rl.end_account_receivable) as debtTotal
         from base_data_customer_short tb
         left join sys_dept d on tb.dept_id = d.id
         left join sys_dept r on tb.region = r.id
         left join customer_credit cc on tb.customer_id = cc.company_id
+        left join receipt_ledger_info rl on tb.id = rl.customer_short_id
+        <where>
+            <if test="vo.customerType != null and vo.customerType != ''">
+                and tb.type = #{vo.customerType}
+            </if>
+            <if test="vo.debtStatus != null and vo.debtStatus != ''">
+                and rl.debt_status = #{vo.debtStatus}
+            </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                and d.name like concat('%', #{vo.deptName}, '%')
+            </if>
+        </where>
         group by tb.short_name,tb.type,tb.dept_id,tb.region
+        having 1=1
+        <if test="vo.debtStartValue != null">
+            and sum(rl.end_account_receivable) >= #{debtStartValue}
+        </if>
+        <if test="vo.debtEndValue != null">
+            and sum(rl.end_account_receivable) &lt;= #{debtEndValue}
+        </if>
     </select>
 
     <select id="statisticsDeptByShortName" resultType="java.util.Map">