jiangjiazhi / yimiao

Download as
Browse Code »

Commit 2ebca1ab69f9bd9ed5a165a7746f0f96d02079bf

Authored by landong2015
1 parent d4fb40a2f1
Exists in master

测试可否修改类名,区分大小写

Showing 9 changed files with 200 additions and 23 deletions

mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java View file @ 2ebca1a
1 1 package com.lymsh.yimiao.main.data.dao;
2 2  
3   -import com.lymsh.yimiao.main.data.model.MedInoculateorder;
  3 +import com.lymsh.yimiao.main.data.model.MedInoculateOrder;
4 4 import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery;
5 5  
6 6 import java.util.List;
7 7  
8 8 public interface MedInoculateorderMapper {
9   - public void addMedInoculateorder(MedInoculateorder obj);
  9 + public void addMedInoculateorder(MedInoculateOrder obj);
10 10  
11   - public void updateMedInoculateorder(MedInoculateorder obj);
  11 + public void updateMedInoculateorder(MedInoculateOrder obj);
12 12  
13 13 public void deleteMedInoculateorder(Integer id);
14 14  
15   - public MedInoculateorder getMedInoculateorder(String id);
  15 + public MedInoculateOrder getMedInoculateorder(String id);
16 16  
17 17 public int queryMedInoculateorderCount(MedInoculateorderQuery query);
18 18  
19   - public List<MedInoculateorder> queryMedInoculateorder(MedInoculateorderQuery query);
  19 + public List<MedInoculateOrder> queryMedInoculateorder(MedInoculateorderQuery query);
20 20  
21 21 }
mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java View file @ 2ebca1a
1 1 package com.lymsh.yimiao.main.data.dao;
2 2  
  3 +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery;
3 4 import com.lymsh.yimiao.main.data.model.MedInoculaterecord;
4   -import com.lymsh.yimiao.main.data.model.MedInoculaterecordQuery;
5 5  
6 6 import java.util.List;
7 7  
8 8  
... ... @@ -14,9 +14,9 @@
14 14  
15 15 public MedInoculaterecord getMedInoculaterecord(String id);
16 16  
17   - public int queryMedInoculaterecordCount(MedInoculaterecordQuery query);
  17 + public int queryMedInoculaterecordCount(MedInoculateRecordQuery query);
18 18  
19   - public List<MedInoculaterecord> queryMedInoculaterecord(MedInoculaterecordQuery query);
  19 + public List<MedInoculaterecord> queryMedInoculaterecord(MedInoculateRecordQuery query);
20 20  
21 21 }
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrder.java View file @ 2ebca1a
  1 +package com.lymsh.yimiao.main.data.model;
  2 +
  3 +import java.util.Date;
  4 +
  5 +public class MedInoculateOrder {
  6 + private String ioId;
  7 + private String ioKidId;
  8 + private String ioVaccineId;
  9 + private String ioOrganizationId;
  10 + private String ioInoculateDate;
  11 + private String ioInoculateTime;
  12 + private String ioOrderOPer;
  13 + private String ioOrderTime;
  14 +
  15 + public String getIoId() {
  16 + return ioId;
  17 + }
  18 +
  19 + public void setIoId(String ioId) {
  20 + this.ioId = ioId;
  21 + }
  22 +
  23 + public String getIoKidId() {
  24 + return ioKidId;
  25 + }
  26 +
  27 + public void setIoKidId(String ioKidId) {
  28 + this.ioKidId = ioKidId;
  29 + }
  30 +
  31 + public String getIoVaccineId() {
  32 + return ioVaccineId;
  33 + }
  34 +
  35 + public void setIoVaccineId(String ioVaccineId) {
  36 + this.ioVaccineId = ioVaccineId;
  37 + }
  38 +
  39 + public String getIoOrganizationId() {
  40 + return ioOrganizationId;
  41 + }
  42 +
  43 + public void setIoOrganizationId(String ioOrganizationId) {
  44 + this.ioOrganizationId = ioOrganizationId;
  45 + }
  46 +
  47 + public String getIoInoculateDate() {
  48 + return ioInoculateDate;
  49 + }
  50 +
  51 + public void setIoInoculateDate(String ioInoculateDate) {
  52 + this.ioInoculateDate = ioInoculateDate;
  53 + }
  54 +
  55 + public String getIoInoculateTime() {
  56 + return ioInoculateTime;
  57 + }
  58 +
  59 + public void setIoInoculateTime(String ioInoculateTime) {
  60 + this.ioInoculateTime = ioInoculateTime;
  61 + }
  62 +
  63 + public String getIoOrderOPer() {
  64 + return ioOrderOPer;
  65 + }
  66 +
  67 + public void setIoOrderOPer(String ioOrderOPer) {
  68 + this.ioOrderOPer = ioOrderOPer;
  69 + }
  70 +
  71 + public String getIoOrderTime() {
  72 + return ioOrderTime;
  73 + }
  74 +
  75 + public void setIoOrderTime(String ioOrderTime) {
  76 + this.ioOrderTime = ioOrderTime;
  77 + }
  78 +}
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecordQuery.java View file @ 2ebca1a
  1 +package com.lymsh.yimiao.main.data.model;
  2 +
  3 +
  4 +import java.util.Date;
  5 +
  6 +import com.lymsh.mommybaby.basecommon.base.BaseQuery;
  7 +
  8 +
  9 +public class MedInoculateRecordQuery extends BaseQuery {
  10 + private String icId;
  11 + private String icKidId;
  12 + private String icVaccineId;
  13 + private String icInoculateTime;
  14 + private String icDoctor;
  15 + private String icPosition;
  16 + private String icBatchNumber;
  17 + private String icOrganizationId;
  18 + private String icIsInoculate;
  19 + private String icJiCi;
  20 +
  21 + public String getIcId() {
  22 + return icId;
  23 + }
  24 +
  25 + public void setIcId(String icId) {
  26 + this.icId = icId;
  27 + }
  28 +
  29 + public String getIcKidId() {
  30 + return icKidId;
  31 + }
  32 +
  33 + public void setIcKidId(String icKidId) {
  34 + this.icKidId = icKidId;
  35 + }
  36 +
  37 + public String getIcVaccineId() {
  38 + return icVaccineId;
  39 + }
  40 +
  41 + public void setIcVaccineId(String icVaccineId) {
  42 + this.icVaccineId = icVaccineId;
  43 + }
  44 +
  45 + public String getIcInoculateTime() {
  46 + return icInoculateTime;
  47 + }
  48 +
  49 + public void setIcInoculateTime(String icInoculateTime) {
  50 + this.icInoculateTime = icInoculateTime;
  51 + }
  52 +
  53 + public String getIcDoctor() {
  54 + return icDoctor;
  55 + }
  56 +
  57 + public void setIcDoctor(String icDoctor) {
  58 + this.icDoctor = icDoctor;
  59 + }
  60 +
  61 + public String getIcPosition() {
  62 + return icPosition;
  63 + }
  64 +
  65 + public void setIcPosition(String icPosition) {
  66 + this.icPosition = icPosition;
  67 + }
  68 +
  69 + public String getIcBatchNumber() {
  70 + return icBatchNumber;
  71 + }
  72 +
  73 + public void setIcBatchNumber(String icBatchNumber) {
  74 + this.icBatchNumber = icBatchNumber;
  75 + }
  76 +
  77 + public String getIcOrganizationId() {
  78 + return icOrganizationId;
  79 + }
  80 +
  81 + public void setIcOrganizationId(String icOrganizationId) {
  82 + this.icOrganizationId = icOrganizationId;
  83 + }
  84 +
  85 + public String getIcIsInoculate() {
  86 + return icIsInoculate;
  87 + }
  88 +
  89 + public void setIcIsInoculate(String icIsInoculate) {
  90 + this.icIsInoculate = icIsInoculate;
  91 + }
  92 +
  93 + public String getIcJiCi() {
  94 + return icJiCi;
  95 + }
  96 +
  97 + public void setIcJiCi(String icJiCi) {
  98 + this.icJiCi = icJiCi;
  99 + }
  100 +}
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateorder.java View file @ 2ebca1a
... ... @@ -2,7 +2,7 @@
2 2  
3 3 import java.util.Date;
4 4  
5   -public class MedInoculateorder {
  5 +public class MedInoculateOrder {
6 6 private String ioId;
7 7 private String ioKidId;
8 8 private String ioVaccineId;
mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java View file @ 2ebca1a
1 1 package com.lymsh.yimiao.main.data.service;
2 2  
3   -import com.lymsh.yimiao.main.data.model.MedInoculateorder;
  3 +import com.lymsh.yimiao.main.data.model.MedInoculateOrder;
4 4 import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery;
5 5  
6 6 import java.util.List;
7 7  
8 8 public interface MedInoculateorderService {
9   - public void addMedInoculateorder(MedInoculateorder obj);
  9 + public void addMedInoculateorder(MedInoculateOrder obj);
10 10  
11   - public void updateMedInoculateorder(MedInoculateorder obj);
  11 + public void updateMedInoculateorder(MedInoculateOrder obj);
12 12  
13 13 public void deleteMedInoculateorder(Integer id);
14 14  
15   - public MedInoculateorder getMedInoculateorder(String id);
  15 + public MedInoculateOrder getMedInoculateorder(String id);
16 16  
17 17 public int queryMedInoculateorderCount(MedInoculateorderQuery query);
18 18  
19   - public List<MedInoculateorder> queryMedInoculateorder(MedInoculateorderQuery query);
  19 + public List<MedInoculateOrder> queryMedInoculateorder(MedInoculateorderQuery query);
20 20  
21 21 }
mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java View file @ 2ebca1a
1 1 package com.lymsh.yimiao.main.data.service.impl;
2 2  
3 3 import com.lymsh.yimiao.main.data.dao.MedInoculateorderMapper;
4   -import com.lymsh.yimiao.main.data.model.MedInoculateorder;
  4 +import com.lymsh.yimiao.main.data.model.MedInoculateOrder;
5 5 import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery;
6 6 import com.lymsh.yimiao.main.data.service.MedInoculateorderService;
7 7 import org.springframework.beans.factory.annotation.Autowired;
8 8 import org.springframework.stereotype.Service;
9 9  
10   -import java.util.Date;
11 10 import java.util.List;
12 11  
13 12 @Service
14 13  
15 14  
16 15  
... ... @@ -17,17 +16,17 @@
17 16 private MedInoculateorderMapper medInoculateorderMapper;
18 17  
19 18 @Override
20   -public void addMedInoculateorder(MedInoculateorder obj){medInoculateorderMapper.addMedInoculateorder(obj);}
  19 +public void addMedInoculateorder(MedInoculateOrder obj){medInoculateorderMapper.addMedInoculateorder(obj);}
21 20 @Override
22   -public void updateMedInoculateorder(MedInoculateorder obj){medInoculateorderMapper.updateMedInoculateorder(obj);}
  21 +public void updateMedInoculateorder(MedInoculateOrder obj){medInoculateorderMapper.updateMedInoculateorder(obj);}
23 22 @Override
24 23 public void deleteMedInoculateorder (Integer id){medInoculateorderMapper.deleteMedInoculateorder(id);}
25 24 @Override
26   -public MedInoculateorder getMedInoculateorder (String id){return medInoculateorderMapper.getMedInoculateorder(id);}
  25 +public MedInoculateOrder getMedInoculateorder (String id){return medInoculateorderMapper.getMedInoculateorder(id);}
27 26 @Override
28 27 public int queryMedInoculateorderCount (MedInoculateorderQuery query){return medInoculateorderMapper.queryMedInoculateorderCount(query);}
29 28 @Override
30   -public List<MedInoculateorder> queryMedInoculateorder (MedInoculateorderQuery query){if (query.getNeed() != null) {query.mysqlBuild(medInoculateorderMapper.queryMedInoculateorderCount(query));}return medInoculateorderMapper.queryMedInoculateorder(query);}
  29 +public List<MedInoculateOrder> queryMedInoculateorder (MedInoculateorderQuery query){if (query.getNeed() != null) {query.mysqlBuild(medInoculateorderMapper.queryMedInoculateorderCount(query));}return medInoculateorderMapper.queryMedInoculateorder(query);}
31 30  
32 31 }
mainData/src/main/resources/mainOrm/MedInoculateorder.xml View file @ 2ebca1a
... ... @@ -2,7 +2,7 @@
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 3 <mapper namespace="com.lymsh.yimiao.main.data.dao.MedInoculateorderMapper">
4 4  
5   -<resultMap id="MedInoculateorderResultMap" type="com.lymsh.yimiao.main.data.model.MedInoculateorder">
  5 +<resultMap id="MedInoculateorderResultMap" type="com.lymsh.yimiao.main.data.model.MedInoculateOrder">
6 6 <result column="io_id" property="ioId" jdbcType="VARCHAR" />
7 7 <result column="io_kidId" property="ioKidId" jdbcType="VARCHAR" />
8 8 <result column="io_vaccineId" property="ioVaccineId" jdbcType="VARCHAR" />
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java View file @ 2ebca1a
... ... @@ -209,10 +209,10 @@
209 209 inoculateorderQuery.setIoKidId(id);
210 210 //时间倒序
211 211 inoculateorderQuery.setIoInoculateTime("ioInoculateTime desc");
212   - List<MedInoculateorder> inoculateorderList = medInoculateorderService.queryMedInoculateorder(inoculateorderQuery);
  212 + List<MedInoculateOrder> inoculateorderList = medInoculateorderService.queryMedInoculateorder(inoculateorderQuery);
213 213 if (CollectionUtils.isNotEmpty(inoculateorderList)) {
214 214 //取出离现在日期最近的一个预约接种
215   - MedInoculateorder medInoculateorder = inoculateorderList.get(0);
  215 + MedInoculateOrder medInoculateorder = inoculateorderList.get(0);
216 216 //下次接种时间
217 217 map.put("ioInoculateTime", medInoculateorder.getIoInoculateTime());
218 218 //下次接种疫苗