From 43b6b4b905fb272e2d7d9c0738610c4204c958ce Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 01:07:24 +0800
Subject: [PATCH] 增加首页搜索接口参数调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 14 ++++++++++----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 3 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeQueryVO.java | 16 ++++++++++------
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
index 00c2a29..eefd170 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
@@ -117,20 +117,26 @@
left join blade_dict_biz dt on n.node_type=dt.dict_key and dt.code='nc_node_type' and dt.is_deleted=0
<where>
n.is_deleted=0 and n.node_type='20' and n.name=#{drawingNo}
- <if test="programStatus != null and programStatus != ''">
+ <if test="status != null and status != ''">
and
(
- <if test='programStatus.contains("1")'>
+ <if test='status.contains("1")'>
n.parent_ids LIKE '0,1,%'
</if>
- <if test='programStatus.contains("2")'>
+ <if test='status.contains("2")'>
or n.parent_ids LIKE '0,2,%'
</if>
- <if test='programStatus.contains("2")'>
+ <if test='status.contains("2")'>
or n.parent_ids LIKE '0,3,%'
</if>
)
</if>
+ <if test="createTimeBegin != null">
+ n.create_time>=#{createTimeBegin}
+ </if>
+ <if test="createTimeEnd != null">
+ n.create_time<=#{createTimeEnd}
+ </if>
</where>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index 2994db2..d275a46 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -160,6 +160,9 @@
*/
public List<NcNodeVO> searchList2(NcNodeQueryVO queryVO) {
//1.鏍规嵁闆剁粍浠跺彿鍜屽垱寤烘椂闂存煡璇㈠垵濮嬪垪琛�,鏌ヨ鐨勫師濮嬪垪琛紝闇�瑕乭asChild瀛楁锛屾墍浠ヤ娇鐢╩apper.xml
+ if(queryVO.getCreateTimeEnd()!=null){
+ queryVO.setCreateTimeEnd(queryVO.getCreateTimeEnd().plusDays(1));
+ }
List<NcNodeVO> oriList = this.getBaseMapper().searchList2(queryVO);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeQueryVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeQueryVO.java
index 4543655..b9e85c2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeQueryVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeQueryVO.java
@@ -6,24 +6,28 @@
import org.springblade.mdm.commons.vo.BaseVO;
import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
@Schema(description = "棣栭〉鏍戞煡璇㈠弬鏁板璞�")
@Setter
@Getter
public class NcNodeQueryVO {
+ @Schema(description = "绋嬪簭鐘舵�侀殧")
+ private List<String> programStatus;
@Schema(description = "绋嬪簭鐘舵�侊紙璇曞垏1;鍥哄寲2;鍋忕3锛夛紝澶氶�夐�楀彿鍒嗛殧")
- private String programStatus;
-
+ private String status;
@Schema(description = "闆剁粍浠跺彿")
private String drawingNo;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ //@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "璧峰鏃堕棿")
- private LocalDateTime createTimeBegin;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDate createTimeBegin;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@Schema(description = "缁撴潫鏃堕棿")
- private LocalDateTime createTimeEnd;
+ private LocalDate createTimeEnd;
}
--
Gitblit v1.9.3