Commit ad0d1e725f67f1b1c304a2de6cc7ef02bfac3b06
1 parent
2ebca1ab69
Exists in
master
测试可否修改类名,区分大小写
Showing 6 changed files with 88 additions and 12 deletions
- mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateOrderQuery.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculateorderServiceImpl.java
- mainData/src/main/resources/mainOrm/MedInoculateorder.xml
- webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateorderMapper.java
View file @
ad0d1e7
| 1 | 1 | package com.lymsh.yimiao.main.data.dao; |
| 2 | 2 | |
| 3 | 3 | import com.lymsh.yimiao.main.data.model.MedInoculateOrder; |
| 4 | -import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; | |
| 4 | +import com.lymsh.yimiao.main.data.model.MedInoculateOrderQuery; | |
| 5 | 5 | |
| 6 | 6 | import java.util.List; |
| 7 | 7 | |
| 8 | 8 | |
| ... | ... | @@ -14,9 +14,9 @@ |
| 14 | 14 | |
| 15 | 15 | public MedInoculateOrder getMedInoculateorder(String id); |
| 16 | 16 | |
| 17 | - public int queryMedInoculateorderCount(MedInoculateorderQuery query); | |
| 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/model/MedInoculateOrderQuery.java
View file @
ad0d1e7
| 1 | +package com.lymsh.yimiao.main.data.model; | |
| 2 | + | |
| 3 | +public class MedInoculateOrderQuery { | |
| 4 | + private String ioId; | |
| 5 | + private String ioKidId; | |
| 6 | + private String ioVaccineId; | |
| 7 | + private String ioOrganizationId; | |
| 8 | + private String ioInoculateDate; | |
| 9 | + private String ioInoculateTime; | |
| 10 | + private String ioOrderOPer; | |
| 11 | + private String ioOrderTime; | |
| 12 | + | |
| 13 | + public String getIoId() { | |
| 14 | + return ioId; | |
| 15 | + } | |
| 16 | + | |
| 17 | + public void setIoId(String ioId) { | |
| 18 | + this.ioId = ioId; | |
| 19 | + } | |
| 20 | + | |
| 21 | + public String getIoKidId() { | |
| 22 | + return ioKidId; | |
| 23 | + } | |
| 24 | + | |
| 25 | + public void setIoKidId(String ioKidId) { | |
| 26 | + this.ioKidId = ioKidId; | |
| 27 | + } | |
| 28 | + | |
| 29 | + public String getIoVaccineId() { | |
| 30 | + return ioVaccineId; | |
| 31 | + } | |
| 32 | + | |
| 33 | + public void setIoVaccineId(String ioVaccineId) { | |
| 34 | + this.ioVaccineId = ioVaccineId; | |
| 35 | + } | |
| 36 | + | |
| 37 | + public String getIoOrganizationId() { | |
| 38 | + return ioOrganizationId; | |
| 39 | + } | |
| 40 | + | |
| 41 | + public void setIoOrganizationId(String ioOrganizationId) { | |
| 42 | + this.ioOrganizationId = ioOrganizationId; | |
| 43 | + } | |
| 44 | + | |
| 45 | + public String getIoInoculateDate() { | |
| 46 | + return ioInoculateDate; | |
| 47 | + } | |
| 48 | + | |
| 49 | + public void setIoInoculateDate(String ioInoculateDate) { | |
| 50 | + this.ioInoculateDate = ioInoculateDate; | |
| 51 | + } | |
| 52 | + | |
| 53 | + public String getIoInoculateTime() { | |
| 54 | + return ioInoculateTime; | |
| 55 | + } | |
| 56 | + | |
| 57 | + public void setIoInoculateTime(String ioInoculateTime) { | |
| 58 | + this.ioInoculateTime = ioInoculateTime; | |
| 59 | + } | |
| 60 | + | |
| 61 | + public String getIoOrderOPer() { | |
| 62 | + return ioOrderOPer; | |
| 63 | + } | |
| 64 | + | |
| 65 | + public void setIoOrderOPer(String ioOrderOPer) { | |
| 66 | + this.ioOrderOPer = ioOrderOPer; | |
| 67 | + } | |
| 68 | + | |
| 69 | + public String getIoOrderTime() { | |
| 70 | + return ioOrderTime; | |
| 71 | + } | |
| 72 | + | |
| 73 | + public void setIoOrderTime(String ioOrderTime) { | |
| 74 | + this.ioOrderTime = ioOrderTime; | |
| 75 | + } | |
| 76 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateorderService.java
View file @
ad0d1e7
| 1 | 1 | package com.lymsh.yimiao.main.data.service; |
| 2 | 2 | |
| 3 | 3 | import com.lymsh.yimiao.main.data.model.MedInoculateOrder; |
| 4 | -import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; | |
| 4 | +import com.lymsh.yimiao.main.data.model.MedInoculateOrderQuery; | |
| 5 | 5 | |
| 6 | 6 | import java.util.List; |
| 7 | 7 | |
| 8 | 8 | |
| ... | ... | @@ -14,9 +14,9 @@ |
| 14 | 14 | |
| 15 | 15 | public MedInoculateOrder getMedInoculateorder(String id); |
| 16 | 16 | |
| 17 | - public int queryMedInoculateorderCount(MedInoculateorderQuery query); | |
| 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 @
ad0d1e7
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | |
| 3 | 3 | import com.lymsh.yimiao.main.data.dao.MedInoculateorderMapper; |
| 4 | 4 | import com.lymsh.yimiao.main.data.model.MedInoculateOrder; |
| 5 | -import com.lymsh.yimiao.main.data.model.MedInoculateorderQuery; | |
| 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 | |
| ... | ... | @@ -24,9 +24,9 @@ |
| 24 | 24 | @Override |
| 25 | 25 | public MedInoculateOrder getMedInoculateorder (String id){return medInoculateorderMapper.getMedInoculateorder(id);} |
| 26 | 26 | @Override |
| 27 | -public int queryMedInoculateorderCount (MedInoculateorderQuery query){return medInoculateorderMapper.queryMedInoculateorderCount(query);} | |
| 27 | +public int queryMedInoculateorderCount (MedInoculateOrderQuery query){return medInoculateorderMapper.queryMedInoculateorderCount(query);} | |
| 28 | 28 | @Override |
| 29 | -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);} | |
| 30 | 30 | |
| 31 | 31 | } |
mainData/src/main/resources/mainOrm/MedInoculateorder.xml
View file @
ad0d1e7
| ... | ... | @@ -63,7 +63,7 @@ |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | |
| 66 | -<select id="queryMedInoculateorder" resultMap="MedInoculateorderResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedInoculateorderQuery"> | |
| 66 | +<select id="queryMedInoculateorder" resultMap="MedInoculateorderResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedInoculateOrderQuery"> | |
| 67 | 67 | select io_id,io_kidId,io_vaccineId,io_organizationId,io_inoculateDate,io_inoculateTime,io_orderOper,io_orderTime |
| 68 | 68 | from med_inoculateorder |
| 69 | 69 | <include refid="MedInoculateorderCondition" /> |
| ... | ... | @@ -72,7 +72,7 @@ |
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | |
| 75 | -<select id="queryMedInoculateorderCount" resultType="int" parameterType="com.lymsh.yimiao.main.data.model.MedInoculateorderQuery"> | |
| 75 | +<select id="queryMedInoculateorderCount" resultType="int" parameterType="com.lymsh.yimiao.main.data.model.MedInoculateOrderQuery"> | |
| 76 | 76 | select count(1) from med_inoculateorder |
| 77 | 77 | <include refid="MedInoculateorderCondition" /> |
| 78 | 78 | </select> |
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
View file @
ad0d1e7
| ... | ... | @@ -205,7 +205,7 @@ |
| 205 | 205 | //TODO 这里需要把这个字符串转换成时间戳 |
| 206 | 206 | map.put("birthday", kids.getBirthday()); |
| 207 | 207 | |
| 208 | - MedInoculateorderQuery inoculateorderQuery = new MedInoculateorderQuery(); | |
| 208 | + MedInoculateOrderQuery inoculateorderQuery = new MedInoculateOrderQuery(); | |
| 209 | 209 | inoculateorderQuery.setIoKidId(id); |
| 210 | 210 | //时间倒序 |
| 211 | 211 | inoculateorderQuery.setIoInoculateTime("ioInoculateTime desc"); |