From 48d58be716ed351d09c2754ad7cdaaf4259ba6aa Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Tue, 09 Aug 2022 09:34:48 +0800
Subject: [PATCH] 增加小程序列表请求接口
---
src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java | 15 +++++++++++++++
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java | 5 +++++
src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java | 14 ++++++++++++++
src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java | 2 ++
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java | 1 +
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 19 +++++++++++++++++++
6 files changed, 56 insertions(+), 0 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 28e582b..09966c9 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -71,6 +71,20 @@
}
/**
+ * 小程序列表分页
+ * @param traceability
+ * @param query
+ * @return
+ */
+ @GetMapping("/xcxpage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入traceability")
+ public R<IPage<TraceabilityVO>> xcxpage(TraceabilityVO traceability, Query query) {
+ IPage<TraceabilityVO> pages = traceabilityService.selectTraceabilityXcxPage(Condition.getPage(query), traceability);
+ return R.data(pages);
+ }
+
+ /**
* 自定义查询，不分页
* @param traceability
* @return
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 6df98a2..01925cc 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
@@ -25,6 +25,7 @@
* @return
*/
List<TraceabilityVO> selectTraceabilityPage(@Param("page") IPage page, @Param("traceability") TraceabilityVO traceability);
+ List<TraceabilityVO> selectTraceabilityXcxPage(@Param("page") IPage page, @Param("traceability") TraceabilityVO traceability);
String selectRevorid(String code);
/**
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 5c26df4..85b0ff9 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -19,6 +19,25 @@
</if>
</select>
+ <!--自定义查询溯源码分页数据-->
+ <select id="selectTraceabilityXcxPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
+ select a.id,a.code,c.land_name as landName,c.id as landId,a.product_name productName,
+ a.create_time createTime,d.url,d.strain_name AS strainName,b.create_time AS recoveryTime from sys_traceability a
+ LEFT JOIN sys_recovery b ON a.recovery_id = b.id
+ LEFT JOIN sys_land c ON b.land_id = c.id
+ LEFT JOIN sys_strain d ON b.strain_id = d.id
+ where 1=1
+ <if test="traceability.code!=null and traceability.code!=''">
+ and a.code like concat('%',#{traceability.code},'%')
+ </if>
+ <if test="traceability.farmId!=null and traceability.farmId!=''">
+ and c.farm_id = #{traceability.farmId}
+ </if>
+ <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+ and a.tenant_id = #{traceability.tenantId}
+ </if>
+ </select>
+
<!--自定义查询溯源码数据，不分页-->
<select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
select st.* from sys_traceability st
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 3a4ba06..0c0560e 100644
--- a/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
+++ b/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
@@ -25,6 +25,8 @@
* @return
*/
IPage<TraceabilityVO> selectTraceabilityPage(IPage<TraceabilityVO> page, TraceabilityVO traceability);
+
+ IPage<TraceabilityVO> selectTraceabilityXcxPage(IPage<TraceabilityVO> page, TraceabilityVO traceability);
String selectRevorid(String code);
/**
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 48ae7bc..8959d12 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
@@ -78,6 +78,11 @@
}
@Override
+ public IPage<TraceabilityVO> selectTraceabilityXcxPage(IPage<TraceabilityVO> page, TraceabilityVO traceability) {
+ return page.setRecords(baseMapper.selectTraceabilityXcxPage(page, traceability));
+ }
+
+ @Override
public String selectRevorid(String code) {
return baseMapper.selectRevorid(code);
}
diff --git a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java b/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
index 8f69056..f438535 100644
--- a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
+++ b/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
@@ -1,7 +1,11 @@
package org.springblade.modules.traceability.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springblade.modules.traceability.entity.Traceability;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 溯源码表VO
@@ -21,4 +25,15 @@
* 地块 id
*/
private String landId;
+
+ private String landName;
+
+ private String url;
+
+ private String strainName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date recoveryTime;
+
}
--
Gitblit v1.9.3