From 377a5e8ff6a1c95b263a361bc8c88b9cedd74264 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 六月 2020 15:31:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 5 ++---
src/main/resources/mapper/LocDetlMapper.xml | 14 +++++++++-----
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4 ++--
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 002570e..5679941 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -7,13 +7,12 @@
import org.springframework.stereotype.Repository;
import java.util.List;
-import java.util.Map;
@Mapper
@Repository
public interface LocDetlMapper extends BaseMapper<LocDetl> {
- List<LocDetl> getStockOutPage(@Param("pageNumber")int pageNumber, @Param("pageSize")int pageSize, @Param("param") Map param);
+ List<LocDetl> getStockOutPage(@Param("pageNumber")int pageNumber, @Param("pageSize")int pageSize, @Param("loc_no") Object loc_no);
- Integer getStockOutPageCount();
+ Integer getStockOutPageCount(@Param("loc_no") Object loc_no);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 86b2bd7..10972fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -12,8 +12,8 @@
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCurrent(), page.getSize(), page.getCondition()));
- page.setTotal(baseMapper.getStockOutPageCount());
+ page.setRecords(baseMapper.getStockOutPage(page.getCurrent(), page.getSize(), page.getCondition().get("loc_no")));
+ page.setTotal(baseMapper.getStockOutPageCount(page.getCondition().get("loc_no")));
return page;
}
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b2228fd..045399a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -21,10 +21,15 @@
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
-
</resultMap>
- <select id="getStockOutPage" parameterType="java.util.Map" resultMap="BaseResultMap">
+ <sql id="stockOutCondition">
+ <if test="loc_no!=null and loc_no!='' ">
+ and a.loc_no like '%' + #{loc_no} + '%'
+ </if>
+ </sql>
+
+ <select id="getStockOutPage" resultMap="BaseResultMap">
select * from
(
select
@@ -34,9 +39,7 @@
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
and b.loc_type = 'F'
- <if test="loc_no!=null and loc_no!='' ">
- and a.loc_no like '%' + #{loc_no} + '%'
- </if>
+ <include refid="stockOutCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -47,5 +50,6 @@
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
and b.loc_type = 'F'
+ <include refid="stockOutCondition"></include>
</select>
</mapper>
--
Gitblit v1.9.1