From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 10:20:08 +0800
Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询，不显示待回款为0，默认为打钩。 销售管理】-【回款流水】，增加合同号、项目名称列查询，增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】，增加导出功能
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 13 +++
src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java | 7 +
src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java | 12 +++
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 161 ++++++++++++++++++++++++++++++++-------
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 16 ++++
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 20 ++++
6 files changed, 196 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 3e3013e..104f3d0 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -9,10 +9,13 @@
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.ReceiptPaymentService;
+import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
@RestController
@@ -97,6 +100,16 @@
return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
}
+ @ApiModelProperty("瀵煎嚭鍥炴鐧昏")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ArrayList<Long> ids) {
+ //ids閫夋嫨灏辨槸鍏ㄥ鍑�
+// if (ids == null || ids.size() == 0) {
+// receiptPaymentService.exportPaymentList(response);
+// }
+ receiptPaymentService.exportPaymentList(response, ids);
+ }
+
/**
* 寮�绁ㄥ彴璐﹁鎯�
* @param id
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 061e1d2..92a5a1b 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -1,6 +1,7 @@
package com.ruoyi.sales.dto;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.ReceiptPayment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,49 +13,66 @@
public class ReceiptPaymentDto extends ReceiptPayment {
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
@ApiModelProperty(value = "鏌ヨ鏂囨湰")
+ @Excel(isExport = false)
private String searchText;
@ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
+ @Excel(isExport = false)
private Integer salesLedgerId;
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
+ @Excel(isExport = false)
private Integer customerId;
@ApiModelProperty(value = "鍙戠エ鍙�")
+ @Excel(name = "鍙戠エ鍙�")
private String invoiceNo;
@ApiModelProperty(value = "鍙戠エ閲戦")
+ @Excel(name = "鍙戠エ閲戦")
private BigDecimal invoiceTotal;
- @ApiModelProperty(value = "绋庣巼")
+ @ApiModelProperty(value = "绋庣巼锛�%锛�")
+ @Excel(name = "绋庣巼锛�%锛�")
private BigDecimal taxRate;
@ApiModelProperty(value = "浜у搧澶х被")
+ @Excel(name = "浜у搧澶х被")
private String productCategory;
@ApiModelProperty(value = "鍥炴閲戦")
+ @Excel(name = "鍥炴閲戦")
private BigDecimal receiptPaymentAmountTotal;
@ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Excel(name = "寰呭洖娆鹃噾棰�")
private BigDecimal noReceiptAmount;
@TableField(exist = false)
+ @Excel(isExport = false)
private Boolean status;
@TableField(exist = false)
+ @Excel(isExport = false)
private String receiptPaymentDateStart;
@TableField(exist = false)
+ @Excel(isExport = false)
private String receiptPaymentDateEnd;
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О")
private String projectName;
diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
index ad71e5c..ac868fa 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {
@@ -24,7 +25,7 @@
* @param receiptPaymentDto
* @return
*/
- IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto);
+ IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("c") ReceiptPaymentDto receiptPaymentDto);
/**
* 寮�绁ㄥ彴璐﹁鎯�
@@ -69,4 +70,8 @@
* @return
*/
List<ReceiptPayment> receiptPaymentListByProdRegId(Integer invoiceRegistrationProductId);
+
+ List<ReceiptPaymentDto> bindInvoiceNoRegListAll();
+
+ List<ReceiptPaymentDto> bindInvoiceNoRegListByIds(ArrayList<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index c622368..435a065 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -8,7 +8,9 @@
import com.ruoyi.sales.pojo.ReceiptPayment;
import org.apache.ibatis.annotations.Param;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -90,4 +92,14 @@
* 鏌ヨ鍥炴璁板綍鍒嗛〉
*/
List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto);
+
+ /**
+ * 鍏ㄥ鍑哄洖娆惧垪琛�
+ */
+ void exportPaymentList(HttpServletResponse response);
+
+ /**
+ * 閮ㄥ垎瀵煎嚭鍥炴鍒楄〃
+ */
+ void exportPaymentList(HttpServletResponse response, ArrayList<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index f65d7ce..01a72b8 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
@@ -17,6 +18,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
@@ -253,4 +255,18 @@
public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
return receiptPaymentMapper.receiptPaymentHistoryListNoPage( receiptPaymentDto);
}
+
+ @Override
+ public void exportPaymentList(HttpServletResponse response) {
+ List<ReceiptPaymentDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListAll();
+ ExcelUtil<ReceiptPaymentDto> util = new ExcelUtil<ReceiptPaymentDto>(ReceiptPaymentDto.class);
+ util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ }
+
+ @Override
+ public void exportPaymentList(HttpServletResponse response, ArrayList<Long> ids) {
+ List<ReceiptPaymentDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListByIds(ids);
+ ExcelUtil<ReceiptPaymentDto> util = new ExcelUtil<ReceiptPaymentDto>(ReceiptPaymentDto.class);
+ util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ }
}
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 6f7a62d..8c0fc74 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -61,38 +61,50 @@
<select id="bindInvoiceNoRegPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
SELECT
- T1.id ,
- T1.invoice_no ,
- T1.invoice_total ,
- T3.project_name,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.tax_rate,
- T3.sales_contract_no,
- T3.customer_contract_no,
- T3.customer_name,
- T4.invoiceFileName,
- T5.product_category,
- IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
- (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
+ T1.id ,
+ T1.invoice_no ,
+ T1.invoice_total ,
+ T3.project_name,
+ T1.invoice_person ,
+ T1.invoice_date ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id ,
+ T2.tax_rate,
+ T3.sales_contract_no,
+ T3.customer_contract_no,
+ T3.customer_name,
+ T4.invoiceFileName,
+ T5.product_category,
+ IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
+ (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
FROM invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
+ LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
+ LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
+ LEFT JOIN (
+ SELECT
+ invoice_ledger_id,
+ GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
+ FROM invoice_ledger_file GROUP BY invoice_ledger_id
) T4 ON T4.invoice_ledger_id = T1.id
- LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
- LEFT JOIN (
- SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP BY invoice_ledger_id
- ) T6 ON T1.id = T6.invoice_ledger_id
+ LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
+ LEFT JOIN (
+ SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
+ BY invoice_ledger_id
+ ) T6 ON T1.id = T6.invoice_ledger_id
+ <where>
+ <if test="c.customerName != null and c.customerName !=''">
+ AND T3.customer_name LIKE CONCAT('%',#{c.customerName},'%')
+ </if>
+ <if test="c.customerContractNo != null and c.customerContractNo !=''">
+ AND T1.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
+ </if>
+ <if test="c.projectName != null and c.projectName !=''">
+ AND T3.project_name LIKE CONCAT('%',#{c.projectName},'%')
+ </if>
+ </where>
ORDER BY T2.create_time DESC
</select>
@@ -174,7 +186,9 @@
T1.receipt_payment_type,
T1.registrant,
T1.create_time,
- T4.project_name
+ T4.project_name,
+ T4.sales_contract_no,
+ T4.customer_contract_no
FROM
receipt_payment T1
LEFT JOIN
@@ -191,6 +205,15 @@
</if>
<if test="params.receiptPaymentDateEnd != null and params.receiptPaymentDateEnd != '' ">
AND T1.receipt_payment_date <= date_format(#{params.receiptPaymentDateEnd}, '%Y-%m-%d')
+ </if>
+ <if test="params.projectName != null and params.projectName != '' ">
+ AND T4.project_name LIKE CONCAT('%',#{params.projectName},'%')
+ </if>
+ <if test="params.customerContractNo != null and params.customerContractNo != '' ">
+ AND T1.customer_contract_no LIKE CONCAT('%',#{params.customerContractNo},'%')
+ </if>
+ <if test="params.salesContractNo != null and params.salesContractNo != '' ">
+ AND T1.sales_contract_no LIKE CONCAT('%',#{params.salesContractNo},'%')
</if>
</where>
ORDER BY T1.receipt_payment_date DESC
@@ -309,5 +332,81 @@
WHERE
T2.invoice_registration_product_id = #{invoiceRegistrationProductId}
</select>
+ <select id="bindInvoiceNoRegListAll" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ SELECT
+ T1.id ,
+ T1.invoice_no ,
+ T1.invoice_total ,
+ T3.project_name,
+ T1.invoice_person ,
+ T1.invoice_date ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id ,
+ T2.tax_rate,
+ T3.sales_contract_no,
+ T3.customer_contract_no,
+ T3.customer_name,
+ T4.invoiceFileName,
+ T5.product_category,
+ IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
+ (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
+ FROM invoice_ledger T1
+ LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
+ LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
+ LEFT JOIN (
+ SELECT
+ invoice_ledger_id,
+ GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
+ FROM invoice_ledger_file GROUP BY invoice_ledger_id
+ ) T4 ON T4.invoice_ledger_id = T1.id
+ LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
+ LEFT JOIN (
+ SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
+ BY invoice_ledger_id
+ ) T6 ON T1.id = T6.invoice_ledger_id
+ </select>
+ <select id="bindInvoiceNoRegListByIds" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ SELECT
+ T1.id ,
+ T1.invoice_no ,
+ T1.invoice_total ,
+ T3.project_name,
+ T1.invoice_person ,
+ T1.invoice_date ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id ,
+ T2.tax_rate,
+ T3.sales_contract_no,
+ T3.customer_contract_no,
+ T3.customer_name,
+ T4.invoiceFileName,
+ T5.product_category,
+ IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
+ (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
+ FROM invoice_ledger T1
+ LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
+ LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
+ LEFT JOIN (
+ SELECT
+ invoice_ledger_id,
+ GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
+ FROM invoice_ledger_file GROUP BY invoice_ledger_id
+ ) T4 ON T4.invoice_ledger_id = T1.id
+ LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
+ LEFT JOIN (
+ SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
+ BY invoice_ledger_id
+ ) T6 ON T1.id = T6.invoice_ledger_id
+ WHERE T1.id IN
+ <foreach item="item" collection="ids" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3