From 7ed65656296a198162b91cdf311c197aebcff0e8 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 02 四月 2025 15:25:44 +0800
Subject: [PATCH] 台账 验收 新增名称字段对应 列表及条件搜索调整
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java | 3 +++
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 4 ++++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java | 5 +++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java | 5 +++--
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
index 1f72536..8ffbd79 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
@@ -6,6 +6,9 @@
@Data
public class ReceivingNoteQueryDTO {
+ @Schema(description = "楠屾敹鍗曞悕绉�")
+ private String noteName;
+
@Schema(description = "楠屾敹鍗曠紪鍙�")
private String releaseCode;
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
index f178922..4113a91 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
@@ -11,6 +11,11 @@
private Long id;
/**
+ * 楠屾敹鍗曞悕绉�
+ */
+ private String noteName;
+
+ /**
* 鍚堝悓 鍚嶇О
*/
private String contractName;
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
index 8495ef1..f43eafa 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
@@ -52,8 +52,9 @@
@PreAuthorize("@pms.hasPermission('device_deviceLeasingLedger_view')" )
public R getDeviceLeasingLedgerPage(@ParameterObject Page page, @ParameterObject DeviceLeasingLedger deviceLeasingLedger) {
LambdaQueryWrapper<DeviceLeasingLedger> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode());
- wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode());
+ wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerName()),DeviceLeasingLedger::getLedgerName,deviceLeasingLedger.getLedgerName());
+ wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode());
+ wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode());
wrapper.orderByDesc(DeviceLeasingLedger::getCreateTime);
return R.ok(deviceLeasingLedgerService.page(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index e75ca39..1a883c5 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -21,6 +21,7 @@
<select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
select
rn.id,
+ rn.note_name,
rn.resource_type ,
rn.release_date ,
rn.release_code,
@@ -40,6 +41,9 @@
<if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
</if>
+ <if test="queryDTO.noteName != null and queryDTO.noteName !=''">
+ and rn.note_name like CONCAT('%', #{queryDTO.noteName}, '%')
+ </if>
<if test="queryDTO.contractName != null and queryDTO.contractName !=''">
and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
</if>
--
Gitblit v1.9.1