From 559d5c2bb1d7e648af1fc9a754e33e39ac8fc143 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 16 May 2016 11:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lymsh/yimiao/main/data/dao/MedKidsMapper.java | 5 +++- .../main/data/model/MedInoculateRecordQuery.java | 9 +++++++ .../yimiao/main/data/service/MedKidsService.java | 5 +++- .../main/data/service/impl/MedKidsServiceImpl.java | 10 ++++++-- mainData/src/main/resources/mainOrm/MedKids.xml | 28 +++++++++++++++++++++- .../yimiao/web/controller/v1/KidsController.java | 18 +++++++++++--- 6 files changed, 67 insertions(+), 8 deletions(-) diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedKidsMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedKidsMapper.java index 7b9e641..034548d 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedKidsMapper.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedKidsMapper.java @@ -1,6 +1,7 @@ package com.lymsh.yimiao.main.data.dao; import com.lymsh.yimiao.main.data.model.KidInoculationRecords; +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; import com.lymsh.yimiao.main.data.model.MedKids; import com.lymsh.yimiao.main.data.model.MedKidsQuery; @@ -19,6 +20,8 @@ public interface MedKidsMapper { public List queryMedKids(MedKidsQuery query); - public List queryInoculationRecord(String kids); + public List queryInoculationRecord(String kidId); + + public List queryInoculationRecords(MedInoculateRecordQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java index 10a59c2..5e8c94b 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java @@ -19,6 +19,15 @@ public class MedInoculateRecordQuery extends BaseQuery { private String icIsInoculate; private String icJiCi; private String isDelete; + private String recordKidId; + + public String getRecordKidId() { + return recordKidId; + } + + public void setRecordKidId(String recordKidId) { + this.recordKidId = recordKidId; + } private List ids;//多个id情况 diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedKidsService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedKidsService.java index ba8d58f..d3028a3 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedKidsService.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedKidsService.java @@ -1,6 +1,7 @@ package com.lymsh.yimiao.main.data.service; import com.lymsh.yimiao.main.data.model.KidInoculationRecords; +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; import com.lymsh.yimiao.main.data.model.MedKids; import com.lymsh.yimiao.main.data.model.MedKidsQuery; @@ -19,6 +20,8 @@ public interface MedKidsService { public List queryMedKids(MedKidsQuery query); - public List queryInoculationRecord(String kids); + public List queryInoculationRecord(String kidId); + + public List queryInoculationRecords(MedInoculateRecordQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java index 59791bd..c3a00b1 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java @@ -2,6 +2,7 @@ package com.lymsh.yimiao.main.data.service.impl; import com.lymsh.yimiao.main.data.dao.MedKidsMapper; import com.lymsh.yimiao.main.data.model.KidInoculationRecords; +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; import com.lymsh.yimiao.main.data.model.MedKids; import com.lymsh.yimiao.main.data.model.MedKidsQuery; import com.lymsh.yimiao.main.data.service.MedKidsService; @@ -31,7 +32,12 @@ public int queryMedKidsCount (MedKidsQuery query){return medKidsMapper.queryMedK public List queryMedKids (MedKidsQuery query){if (query.getNeed() != null) {query.mysqlBuild(medKidsMapper.queryMedKidsCount(query));}return medKidsMapper.queryMedKids(query);} @Override - public List queryInoculationRecord(String kids) { - return medKidsMapper.queryInoculationRecord(kids); + public List queryInoculationRecords(MedInoculateRecordQuery query) { + return medKidsMapper.queryInoculationRecords(query); + } + + @Override + public List queryInoculationRecord(String kidId) { + return medKidsMapper.queryInoculationRecord(kidId); } } \ No newline at end of file diff --git a/mainData/src/main/resources/mainOrm/MedKids.xml b/mainData/src/main/resources/mainOrm/MedKids.xml index e146243..c3c5c64 100644 --- a/mainData/src/main/resources/mainOrm/MedKids.xml +++ b/mainData/src/main/resources/mainOrm/MedKids.xml @@ -140,6 +140,32 @@ select count(1) from med_kids - + \ No newline at end of file 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 d2b5131..5bdae4e 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 @@ -269,7 +269,7 @@ public class KidsController extends BaseController { * @param id 宝宝id */ @RequestMapping(value = "/babys", method = RequestMethod.GET) - //@TokenRequired + @TokenRequired public void getKids(HttpServletResponse response, @RequestParam("id") String id) { if (StringUtils.isBlank(id)) { @@ -277,8 +277,22 @@ public class KidsController extends BaseController { return; } + Map map = new HashMap<>(); + +// MedInoculateRecordQuery recordQuery = new MedInoculateRecordQuery(); +// recordQuery.setRecordKidId(id); +// recordQuery.setSort("IC_INOCULATETIME desc"); +// List recordsAsc = medKidsService.queryInoculationRecords(recordQuery); + List recordsList = medKidsService.queryInoculationRecord(id); + if (CollectionUtils.isNotEmpty(recordsList)){ + //最后一次接种时间 + map.put("lastInculateTime",DateUtil.getSecond(DateUtil.parseYMDHMS(recordsList.get(0).getInoculateTime()))); + }else { + map.put("lastInculateTime",""); + } + //取出建档最早的那个 MedKidsQuery query = new MedKidsQuery(); query.setIsDelete(isDelete); @@ -286,8 +300,6 @@ public class KidsController extends BaseController { query.setSort("KI_BUILDTIME DESC"); List medKidList = medKidsService.queryMedKids(query); - Map map = new HashMap<>(); - if (CollectionUtils.isNotEmpty(medKidList)) { //取出第一个宝宝 MedKids kids = medKidList.get(0); -- 1.8.3.1