From ad0d1e725f67f1b1c304a2de6cc7ef02bfac3b06 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 2 May 2016 11:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=AF=E5=90=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=B1=BB=E5=90=8D,=E5=8C=BA=E5=88=86=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/data/dao/MedInoculateorderMapper.java | 6 +- .../main/data/model/MedInoculateOrderQuery.java | 76 ++++++++++++++++++++++ .../data/service/MedInoculateorderService.java | 6 +- .../service/impl/MedInoculateorderServiceImpl.java | 6 +- .../main/resources/mainOrm/MedInoculateorder.xml | 4 +- .../yimiao/web/controller/v1/KidsController.java | 2 +- 6 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java index b046da6..5230e82 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java @@ -1,7 +1,7 @@ package com.lymsh.yimiao.main.data.dao; import com.lymsh.yimiao.main.data.model.MedInoculateOrder; -import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; +import com.lymsh.yimiao.main.data.model.MedInoculateOrderQuery; import java.util.List; @@ -14,8 +14,8 @@ public interface MedInoculateorderMapper { public MedInoculateOrder getMedInoculateorder(String id); - public int queryMedInoculateorderCount(MedInoculateorderQuery query); + public int queryMedInoculateorderCount(MedInoculateOrderQuery query); - public List queryMedInoculateorder(MedInoculateorderQuery query); + public List queryMedInoculateorder(MedInoculateOrderQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java new file mode 100644 index 0000000..7da0ced --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java @@ -0,0 +1,76 @@ +package com.lymsh.yimiao.main.data.model; + +public class MedInoculateOrderQuery { + private String ioId; + private String ioKidId; + private String ioVaccineId; + private String ioOrganizationId; + private String ioInoculateDate; + private String ioInoculateTime; + private String ioOrderOPer; + private String ioOrderTime; + + public String getIoId() { + return ioId; + } + + public void setIoId(String ioId) { + this.ioId = ioId; + } + + public String getIoKidId() { + return ioKidId; + } + + public void setIoKidId(String ioKidId) { + this.ioKidId = ioKidId; + } + + public String getIoVaccineId() { + return ioVaccineId; + } + + public void setIoVaccineId(String ioVaccineId) { + this.ioVaccineId = ioVaccineId; + } + + public String getIoOrganizationId() { + return ioOrganizationId; + } + + public void setIoOrganizationId(String ioOrganizationId) { + this.ioOrganizationId = ioOrganizationId; + } + + public String getIoInoculateDate() { + return ioInoculateDate; + } + + public void setIoInoculateDate(String ioInoculateDate) { + this.ioInoculateDate = ioInoculateDate; + } + + public String getIoInoculateTime() { + return ioInoculateTime; + } + + public void setIoInoculateTime(String ioInoculateTime) { + this.ioInoculateTime = ioInoculateTime; + } + + public String getIoOrderOPer() { + return ioOrderOPer; + } + + public void setIoOrderOPer(String ioOrderOPer) { + this.ioOrderOPer = ioOrderOPer; + } + + public String getIoOrderTime() { + return ioOrderTime; + } + + public void setIoOrderTime(String ioOrderTime) { + this.ioOrderTime = ioOrderTime; + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java index 5add6c6..74e4f8c 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java @@ -1,7 +1,7 @@ package com.lymsh.yimiao.main.data.service; import com.lymsh.yimiao.main.data.model.MedInoculateOrder; -import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; +import com.lymsh.yimiao.main.data.model.MedInoculateOrderQuery; import java.util.List; @@ -14,8 +14,8 @@ public interface MedInoculateorderService { public MedInoculateOrder getMedInoculateorder(String id); - public int queryMedInoculateorderCount(MedInoculateorderQuery query); + public int queryMedInoculateorderCount(MedInoculateOrderQuery query); - public List queryMedInoculateorder(MedInoculateorderQuery query); + public List queryMedInoculateorder(MedInoculateOrderQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java index 673148a..775d576 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java @@ -2,7 +2,7 @@ package com.lymsh.yimiao.main.data.service.impl; import com.lymsh.yimiao.main.data.dao.MedInoculateorderMapper; import com.lymsh.yimiao.main.data.model.MedInoculateOrder; -import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; +import com.lymsh.yimiao.main.data.model.MedInoculateOrderQuery; import com.lymsh.yimiao.main.data.service.MedInoculateorderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,8 +24,8 @@ public void deleteMedInoculateorder (Integer id){medInoculateorderMapper.deleteM @Override public MedInoculateOrder getMedInoculateorder (String id){return medInoculateorderMapper.getMedInoculateorder(id);} @Override -public int queryMedInoculateorderCount (MedInoculateorderQuery query){return medInoculateorderMapper.queryMedInoculateorderCount(query);} +public int queryMedInoculateorderCount (MedInoculateOrderQuery query){return medInoculateorderMapper.queryMedInoculateorderCount(query);} @Override -public List queryMedInoculateorder (MedInoculateorderQuery query){if (query.getNeed() != null) {query.mysqlBuild(medInoculateorderMapper.queryMedInoculateorderCount(query));}return medInoculateorderMapper.queryMedInoculateorder(query);} +public List queryMedInoculateorder (MedInoculateOrderQuery query){if (query.getNeed() != null) {query.mysqlBuild(medInoculateorderMapper.queryMedInoculateorderCount(query));}return medInoculateorderMapper.queryMedInoculateorder(query);} } \ No newline at end of file diff --git a/mainData/src/main/resources/mainOrm/MedInoculateorder.xml b/mainData/src/main/resources/mainOrm/MedInoculateorder.xml index fd45082..cd5743b 100644 --- a/mainData/src/main/resources/mainOrm/MedInoculateorder.xml +++ b/mainData/src/main/resources/mainOrm/MedInoculateorder.xml @@ -63,7 +63,7 @@ and io_orderTime = #{ioOrderTime,jdbcType=VARCHAR} - select io_id,io_kidId,io_vaccineId,io_organizationId,io_inoculateDate,io_inoculateTime,io_orderOper,io_orderTime from med_inoculateorder @@ -72,7 +72,7 @@ select io_id,io_kidId,io_vaccineId,io_organizationId,io_inoculateDate,io_inocula - select count(1) from med_inoculateorder diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java index ce4d657..1965cd7 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java @@ -205,7 +205,7 @@ public class KidsController extends BaseController{ //TODO 这里需要把这个字符串转换成时间戳 map.put("birthday", kids.getBirthday()); - MedInoculateorderQuery inoculateorderQuery = new MedInoculateorderQuery(); + MedInoculateOrderQuery inoculateorderQuery = new MedInoculateOrderQuery(); inoculateorderQuery.setIoKidId(id); //时间倒序 inoculateorderQuery.setIoInoculateTime("ioInoculateTime desc"); -- 1.8.3.1