From c587f8f148d3504361cf7a61d0cecb4dd64f4d30 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:55:34 +0800
Subject: [PATCH] 新增溯源码查询，不分页
---
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java | 10 ++++++++++
src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java | 10 ++++++++++
src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java | 9 +++++++++
src/main/resources/application-test.yml | 3 +++
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java | 7 +++++++
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 20 ++++++++++++++++++--
6 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
index ef56345..002d236 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -75,6 +75,16 @@
}
/**
+ * 自定义查询，不分页
+ * @param traceability
+ * @return
+ */
+ @GetMapping("/getTraceabilityList")
+ public R getTraceabilityList(TraceabilityVO traceability) {
+ return R.data(traceabilityService.getTraceabilityList(traceability));
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
index 59592e4..6df98a2 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
@@ -33,4 +33,11 @@
* @return
*/
TraceabilityDTO getSimpleInfo(@Param("traceability") Traceability traceability);
+
+ /**
+ * 自定义查询，不分页
+ * @param traceability
+ * @return
+ */
+ List<TraceabilityVO> getTraceabilityList(@Param("traceability") TraceabilityVO traceability);
}
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
index 25c25ed..2fbeef9 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -2,13 +2,29 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.traceability.mapper.TraceabilityMapper">
- <!--自定义查询农场养殖记录分页数据-->
+ <!--自定义查询溯源码分页数据-->
<select id="selectTraceabilityPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
select st.* from sys_traceability st
left join sys_recovery sr on st.recovery_id = sr.id
where 1=1
<if test="traceability.code!=null and traceability.code!=''">
- and st.code = #{traceability.code}
+ and st.code like concat('%',#{traceability.code},'%')
+ </if>
+ <if test="traceability.deptId!=null and traceability.deptId!=''">
+ and st.dept_id = #{traceability.deptId}
+ </if>
+ <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+ and st.tenant_id = #{traceability.tenantId}
+ </if>
+ </select>
+
+ <!--自定义查询溯源码数据，不分页-->
+ <select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
+ select st.* from sys_traceability st
+ left join sys_recovery sr on st.recovery_id = sr.id
+ where 1=1
+ <if test="traceability.code!=null and traceability.code!=''">
+ and st.code like concat('%',#{traceability.code},'%')
</if>
<if test="traceability.deptId!=null and traceability.deptId!=''">
and st.dept_id = #{traceability.deptId}
diff --git a/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java b/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
index 11c3944..4479087 100644
--- a/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
+++ b/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
@@ -8,6 +8,8 @@
import org.springblade.modules.traceability.entity.Traceability;
import org.springblade.modules.traceability.vo.TraceabilityVO;
+import java.util.List;
+
/**
* 溯源码表服务类
* @since 2022-05-19
@@ -38,4 +40,11 @@
* @return
*/
TraceabilityDetailDTO getTraceabilityDetailInfo(Traceability traceability);
+
+ /**
+ * 自定义查询，不分页
+ * @param traceability
+ * @return
+ */
+ List<TraceabilityVO> getTraceabilityList(TraceabilityVO traceability);
}
diff --git a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java b/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
index 77db969..b12d779 100644
--- a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
+++ b/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
@@ -158,4 +158,14 @@
//返回数据
return dto;
}
+
+ /**
+ * 自定义查询，不分页
+ * @param traceability
+ * @return
+ */
+ @Override
+ public List<TraceabilityVO> getTraceabilityList(TraceabilityVO traceability) {
+ return baseMapper.getTraceabilityList(traceability);
+ }
}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index c99d04b..968981d 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -38,3 +38,6 @@
remote-mode: true
upload-domain: http://localhost:8999
remote-path: /usr/share/nginx/html
+
+zhny:
+ codeUrl: http://61.131.136.25:2080/securityInfo.html
--
Gitblit v1.9.3