From adf58ddc0337678c2a6770fe8687e54a44998c0d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceTechnicalAgreementServiceImpl.java | 12 ++++++++++++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java | 3 +++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java | 6 +++---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceTechnicalAgreementMapper.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 +++--
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceTechnicalAgreementService.java | 4 ++++
8 files changed, 37 insertions(+), 5 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/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java
index 396aad7..630c068 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceTechnicalAgreementController.java
@@ -123,8 +123,8 @@
* 鑾峰彇涓嬫媺鍒楄〃
* @return
*/
- @GetMapping("/getDropdownnList")
- public R<List<DeviceTechnicalAgreemnt>> getDropdownnList() {
- return R.ok(deviceTechnicalAgreementService.list());
+ @GetMapping("/getDropdownnList/{deviceId}")
+ public R<List<DeviceTechnicalAgreemnt>> getDropdownnList(@PathVariable("deviceId")Long deviceId) {
+ return R.ok(deviceTechnicalAgreementService.getDropdownnList(deviceId));
}
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceTechnicalAgreementMapper.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceTechnicalAgreementMapper.java
index a8caed3..6a55bb5 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceTechnicalAgreementMapper.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceTechnicalAgreementMapper.java
@@ -9,9 +9,12 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
@Mapper
public interface DeviceTechnicalAgreementMapper extends PlatformxBaseMapper<DeviceTechnicalAgreemnt> {
IPage<DeviceTechnicalAgreementPageVo> page(Page page, @Param("queryDTO") DeviceTechnicalAgreemntQueryDTO queryDTO);
+
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceTechnicalAgreementService.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceTechnicalAgreementService.java
index 9e528a2..f13fb35 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceTechnicalAgreementService.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceTechnicalAgreementService.java
@@ -6,7 +6,11 @@
import com.by4cloud.platformx.device.dto.DeviceTechnicalAgreemntQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceTechnicalAgreemnt;
+import java.util.List;
+
public interface DeviceTechnicalAgreementService extends IService<DeviceTechnicalAgreemnt> {
IPage pageNew(Page page, DeviceTechnicalAgreemntQueryDTO queryDTO);
+
+ List<DeviceTechnicalAgreemnt> getDropdownnList(Long deviceId);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceTechnicalAgreementServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceTechnicalAgreementServiceImpl.java
index 3ac6361..a233765 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceTechnicalAgreementServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceTechnicalAgreementServiceImpl.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.device.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,6 +9,9 @@
import com.by4cloud.platformx.device.mapper.DeviceTechnicalAgreementMapper;
import com.by4cloud.platformx.device.service.DeviceTechnicalAgreementService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+
/**
* 璁惧鎶�鏈崗璁�
*
@@ -20,4 +24,12 @@
public IPage pageNew(Page page, DeviceTechnicalAgreemntQueryDTO queryDTO) {
return baseMapper.page(page,queryDTO);
}
+
+ @Override
+ public List<DeviceTechnicalAgreemnt> getDropdownnList(Long deviceId) {
+ QueryWrapper<DeviceTechnicalAgreemnt> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("device_id",deviceId);
+ List<DeviceTechnicalAgreemnt> list = baseMapper.selectList(queryWrapper);
+ return list;
+ }
}
\ No newline at end of file
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