From e1b550e2dcf6d71a863d206d4a88fec6588a6fd0 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 23 六月 2025 10:20:22 +0800 Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询,不显示待回款为0,默认为打钩。 销售管理】-【回款流水】,增加合同号、项目名称列查询,增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】,增加导出功能 --- src/main/resources/mapper/sales/SalesLedgerMapper.xml | 70 ++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml index 16ba140..96c297c 100644 --- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml +++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml @@ -5,8 +5,74 @@ <mapper namespace="com.ruoyi.sales.mapper.SalesLedgerMapper"> <select id="selectSequencesByDate" resultType="java.lang.Integer"> - SELECT CAST(SUBSTR(sales_contract_no, 9, 2) AS SIGNED) + SELECT CAST(SUBSTR(sales_contract_no,LENGTH(#{datePart})+1 , 3) AS SIGNED) FROM sales_ledger - WHERE SUBSTR(sales_contract_no, 1, 8) = #{datePart} + WHERE sales_contract_no LIKE CONCAT('%',#{datePart},'%') + </select> + <select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger"> + + </select> + + <select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger"> + SELECT + T1.id, + T1.sales_contract_no, + T1.customer_contract_no, + T1.project_name, + T1.entry_date, + T1.salesman, + T1.customer_id, + T1.customer_name, + T1.entry_person, + T1.remarks, + T1.attachment_materials, + T1.tenant_id, + T1.contract_amount, + T1.execution_date, + T2.nick_name AS entry_person_name + FROM + sales_ledger T1 + LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id + <where> + <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' "> + T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%') + </if> + </where> + </select> + + <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger"> + SELECT + T1.id, + T1.sales_contract_no, + T1.customer_contract_no, + T1.project_name, + T1.entry_date, + T1.salesman, + T1.customer_id, + T1.customer_name, + T1.entry_person, + T1.remarks, + T1.attachment_materials, + T1.tenant_id, + T1.contract_amount, + T1.execution_date, + T2.nick_name AS entry_person_name + FROM + sales_ledger T1 + LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id + <where> + <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' "> + T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%') + </if> + <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' "> + T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%') + </if> + <if test="salesLedgerDto.sales_contract_no != null and salesLedgerDto.sales_contract_no != '' "> + T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%') + </if> + <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' "> + T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%') + </if> + </where> </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3