From 4b61be20efa8cdc1a9086b07a2fdc16725c55099 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 27 五月 2025 11:01:36 +0800
Subject: [PATCH] 销售台账功能修改
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 26 ++++++++++++++++++++++++++
src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java | 8 ++++++++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 6 +-----
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 6 +++++-
4 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
index f0d8353..a371b27 100644
--- a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
import org.apache.ibatis.annotations.Param;
@@ -27,4 +28,11 @@
List getSalesNo();
<T> BigDecimal selectSum(LambdaQueryWrapper<T> wrapper, SFunction<T, BigDecimal> column);
+
+ /**
+ *
+ * @param salesLedgerDto
+ * @return
+ */
+ List<SalesLedger> selectSalesLedgerList(@Param("salesLedgerDto") SalesLedgerDto salesLedgerDto);
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index def5e39..472c53b 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -71,9 +71,13 @@
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�")
private String entryPerson;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "褰曞叆浜�")
+ @Excel(name = "褰曞叆浜�")
+ private String entryPersonName;
+
/**
* 澶囨敞
*/
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 4af2a04..08189ff 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -82,11 +82,7 @@
@Override
public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
- LambdaQueryWrapper<SalesLedger> queryWrapper = new LambdaQueryWrapper<>();
- if (StringUtils.isNotBlank(salesLedgerDto.getCustomerName())) {
- queryWrapper.eq(SalesLedger::getCustomerName, salesLedgerDto.getCustomerName());
- }
- return salesLedgerMapper.selectList(queryWrapper);
+ return salesLedgerMapper.selectSalesLedgerList(salesLedgerDto);
}
public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index add6a3f..bb39257 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -12,4 +12,30 @@
<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,
+ 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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3