From 605a19169121bbcaaf559030dd1d9aae614f8026 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 28 十二月 2020 09:51:28 +0800
Subject: [PATCH] 修改 新增
---
src/main/java/com/nanometer/smartlab/service/EncodeReplaceDictServiceImpl.java | 2 +
src/main/java/com/nanometer/smartlab/entity/dto/InWarehouseInfoDto.java | 59 +++++++++++++++++++++++++++++
src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml | 6 ++
3 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml b/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml
index 56dc56b..93e6b96 100644
--- a/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml
@@ -44,10 +44,14 @@
and number = #{p_number}
</if>
<if test="type != null">
- and type = #{type,}
+ and type = #{type}
</if>
</where>
+
order by update_time desc
+ <if test="first != null and pageSize != null">
+ limit #{first},#{pageSize}
+ </if>
</select>
<select id="countAll" resultType="java.lang.Integer">
select count(1)
diff --git a/src/main/java/com/nanometer/smartlab/entity/dto/InWarehouseInfoDto.java b/src/main/java/com/nanometer/smartlab/entity/dto/InWarehouseInfoDto.java
new file mode 100644
index 0000000..ded40c9
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/entity/dto/InWarehouseInfoDto.java
@@ -0,0 +1,59 @@
+package com.nanometer.smartlab.entity.dto;
+
+import java.util.*;
+import java.io.Serializable;
+
+public class InWarehouseInfoDto implements Serializable {
+
+ //用户id
+ private String user;
+ //仓库id
+ private String warehouseId;
+ //货柜id
+ private String containerId;
+ //试剂条码
+ private List<String> reagentCode;
+ //批号
+ private String articleNumber;
+
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
+ public String getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(String warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+
+
+ public String getContainerId() {
+ return containerId;
+ }
+
+ public void setContainerId(String containerId) {
+ this.containerId = containerId;
+ }
+
+ public List<String> getReagentCode() {
+ return reagentCode;
+ }
+
+ public void setReagentCode(List<String> reagentCode) {
+ this.reagentCode = reagentCode;
+ }
+
+ public String getArticleNumber() {
+ return articleNumber;
+ }
+
+ public void setArticleNumber(String articleNumber) {
+ this.articleNumber = articleNumber;
+ }
+}
diff --git a/src/main/java/com/nanometer/smartlab/service/EncodeReplaceDictServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/EncodeReplaceDictServiceImpl.java
index 0870e7c..bb332d5 100644
--- a/src/main/java/com/nanometer/smartlab/service/EncodeReplaceDictServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/EncodeReplaceDictServiceImpl.java
@@ -24,6 +24,8 @@
params.put("number", encodeReplaceDictFilter.getNumber());
params.put("type", encodeReplaceDictFilter.getType());
}
+ params.put("first", offset);
+ params.put("pageSize", pageSize);
return encodeReplaceDictMapper.selectAll(params);
}
--
Gitblit v1.9.2