jiangjiazhi / yimiao

Commit d051f8801dc23992a8780e8f9fe4fbfd6a28ea0a

Authored by landong2015 over 9 years ago

Exists in master

提交疫苗基本信息model

Showing 7 changed files with 131 additions and 26 deletions

mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedVaccineinfoMapper.java
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfo.java
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfoQuery.java
mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedVaccineinfoService.java
mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedVaccineinfoServiceImpl.java
mainData/src/main/resources/mainOrm/MedVaccineinfo.xml
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java

1	1	package com.lymsh.yimiao.main.data.dao;
2	2
3		-import com.lymsh.yimiao.main.data.model.MedVaccineinfo;
4		-import com.lymsh.yimiao.main.data.model.MedVaccineinfoQuery;
	3	+import com.lymsh.yimiao.main.data.model.MedVaccineInfo;
	4	+import com.lymsh.yimiao.main.data.model.MedVaccineInfoQuery;
5	5
6	6	import java.util.List;
7	7
8	8	public interface MedVaccineinfoMapper {
9		- public void addMedVaccineinfo(MedVaccineinfo obj);
	9	+ public void addMedVaccineinfo(MedVaccineInfo obj);
10	10
11		- public void updateMedVaccineinfo(MedVaccineinfo obj);
	11	+ public void updateMedVaccineinfo(MedVaccineInfo obj);
12	12
13	13	public void deleteMedVaccineinfo(Integer id);
14	14
15		- public MedVaccineinfo getMedVaccineinfo(String id);
	15	+ public MedVaccineInfo getMedVaccineinfo(String id);
16	16
17		- public int queryMedVaccineinfoCount(MedVaccineinfoQuery query);
	17	+ public int queryMedVaccineinfoCount(MedVaccineInfoQuery query);
18	18
19		- public List<MedVaccineinfo> queryMedVaccineinfo(MedVaccineinfoQuery query);
	19	+ public List<MedVaccineInfo> queryMedVaccineinfo(MedVaccineInfoQuery query);
20	20
21	21	}

	1	+package com.lymsh.yimiao.main.data.model;
	2	+
	3	+import java.util.Date;
	4	+
	5	+public class MedVaccineInfo {
	6	+ private String viId;
	7	+ private String viName;
	8	+ private String viFactoryId;
	9	+ private String viVaccineNameId;
	10	+ private String viIsValid;
	11	+
	12	+ public String getViId() {
	13	+ return viId;
	14	+ }
	15	+
	16	+ public void setViId(String viId) {
	17	+ this.viId = viId;
	18	+ }
	19	+
	20	+ public String getViName() {
	21	+ return viName;
	22	+ }
	23	+
	24	+ public void setViName(String viName) {
	25	+ this.viName = viName;
	26	+ }
	27	+
	28	+ public String getViFactoryId() {
	29	+ return viFactoryId;
	30	+ }
	31	+
	32	+ public void setViFactoryId(String viFactoryId) {
	33	+ this.viFactoryId = viFactoryId;
	34	+ }
	35	+
	36	+ public String getViVaccineNameId() {
	37	+ return viVaccineNameId;
	38	+ }
	39	+
	40	+ public void setViVaccineNameId(String viVaccineNameId) {
	41	+ this.viVaccineNameId = viVaccineNameId;
	42	+ }
	43	+
	44	+ public String getViIsValid() {
	45	+ return viIsValid;
	46	+ }
	47	+
	48	+ public void setViIsValid(String viIsValid) {
	49	+ this.viIsValid = viIsValid;
	50	+ }
	51	+}

	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 MedVaccineInfoQuery extends BaseQuery {
	10	+ private String viId;
	11	+ private String viName;
	12	+ private String viFactoryId;
	13	+ private String viVaccineNameId;
	14	+ private String viIsValid;
	15	+
	16	+ public String getViId() {
	17	+ return viId;
	18	+ }
	19	+
	20	+ public void setViId(String viId) {
	21	+ this.viId = viId;
	22	+ }
	23	+
	24	+ public String getViName() {
	25	+ return viName;
	26	+ }
	27	+
	28	+ public void setViName(String viName) {
	29	+ this.viName = viName;
	30	+ }
	31	+
	32	+ public String getViFactoryId() {
	33	+ return viFactoryId;
	34	+ }
	35	+
	36	+ public void setViFactoryId(String viFactoryId) {
	37	+ this.viFactoryId = viFactoryId;
	38	+ }
	39	+
	40	+ public String getViVaccineNameId() {
	41	+ return viVaccineNameId;
	42	+ }
	43	+
	44	+ public void setViVaccineNameId(String viVaccineNameId) {
	45	+ this.viVaccineNameId = viVaccineNameId;
	46	+ }
	47	+
	48	+ public String getViIsValid() {
	49	+ return viIsValid;
	50	+ }
	51	+
	52	+ public void setViIsValid(String viIsValid) {
	53	+ this.viIsValid = viIsValid;
	54	+ }
	55	+}

1	1	package com.lymsh.yimiao.main.data.service;
2	2
3		-import com.lymsh.yimiao.main.data.model.MedVaccineinfo;
4		-import com.lymsh.yimiao.main.data.model.MedVaccineinfoQuery;
	3	+import com.lymsh.yimiao.main.data.model.MedVaccineInfo;
	4	+import com.lymsh.yimiao.main.data.model.MedVaccineInfoQuery;
5	5
6	6	import java.util.List;
7	7
8	8	public interface MedVaccineinfoService {
9		- public void addMedVaccineinfo(MedVaccineinfo obj);
	9	+ public void addMedVaccineinfo(MedVaccineInfo obj);
10	10
11		- public void updateMedVaccineinfo(MedVaccineinfo obj);
	11	+ public void updateMedVaccineinfo(MedVaccineInfo obj);
12	12
13	13	public void deleteMedVaccineinfo(Integer id);
14	14
15		- public MedVaccineinfo getMedVaccineinfo(String id);
	15	+ public MedVaccineInfo getMedVaccineinfo(String id);
16	16
17		- public int queryMedVaccineinfoCount(MedVaccineinfoQuery query);
	17	+ public int queryMedVaccineinfoCount(MedVaccineInfoQuery query);
18	18
19		- public List<MedVaccineinfo> queryMedVaccineinfo(MedVaccineinfoQuery query);
	19	+ public List<MedVaccineInfo> queryMedVaccineinfo(MedVaccineInfoQuery query);
20	20
21	21	}

1	1	package com.lymsh.yimiao.main.data.service.impl;
2	2
3	3	import com.lymsh.yimiao.main.data.dao.MedVaccineinfoMapper;
4		-import com.lymsh.yimiao.main.data.model.MedVaccineinfo;
5		-import com.lymsh.yimiao.main.data.model.MedVaccineinfoQuery;
	4	+import com.lymsh.yimiao.main.data.model.MedVaccineInfo;
	5	+import com.lymsh.yimiao.main.data.model.MedVaccineInfoQuery;
6	6	import com.lymsh.yimiao.main.data.service.MedVaccineinfoService;
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	16
...	...	@@ -17,17 +16,17 @@
17	16	private MedVaccineinfoMapper medVaccineinfoMapper;
18	17
19	18	@Override
20		-public void addMedVaccineinfo(MedVaccineinfo obj){medVaccineinfoMapper.addMedVaccineinfo(obj);}
	19	+public void addMedVaccineinfo(MedVaccineInfo obj){medVaccineinfoMapper.addMedVaccineinfo(obj);}
21	20	@Override
22		-public void updateMedVaccineinfo(MedVaccineinfo obj){medVaccineinfoMapper.updateMedVaccineinfo(obj);}
	21	+public void updateMedVaccineinfo(MedVaccineInfo obj){medVaccineinfoMapper.updateMedVaccineinfo(obj);}
23	22	@Override
24	23	public void deleteMedVaccineinfo (Integer id){medVaccineinfoMapper.deleteMedVaccineinfo(id);}
25	24	@Override
26		-public MedVaccineinfo getMedVaccineinfo (String id){return medVaccineinfoMapper.getMedVaccineinfo(id);}
	25	+public MedVaccineInfo getMedVaccineinfo (String id){return medVaccineinfoMapper.getMedVaccineinfo(id);}
27	26	@Override
28		-public int queryMedVaccineinfoCount (MedVaccineinfoQuery query){return medVaccineinfoMapper.queryMedVaccineinfoCount(query);}
	27	+public int queryMedVaccineinfoCount (MedVaccineInfoQuery query){return medVaccineinfoMapper.queryMedVaccineinfoCount(query);}
29	28	@Override
30		-public List<MedVaccineinfo> queryMedVaccineinfo (MedVaccineinfoQuery query){if (query.getNeed() != null) {query.mysqlBuild(medVaccineinfoMapper.queryMedVaccineinfoCount(query));}return medVaccineinfoMapper.queryMedVaccineinfo(query);}
	29	+public List<MedVaccineInfo> queryMedVaccineinfo (MedVaccineInfoQuery query){if (query.getNeed() != null) {query.mysqlBuild(medVaccineinfoMapper.queryMedVaccineinfoCount(query));}return medVaccineinfoMapper.queryMedVaccineinfo(query);}
31	30
32	31	}

...	...	@@ -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.MedVaccineinfoMapper">
4	4
5		-<resultMap id="MedVaccineinfoResultMap" type="com.lymsh.yimiao.main.data.model.MedVaccineinfo">
	5	+<resultMap id="MedVaccineinfoResultMap" type="com.lymsh.yimiao.main.data.model.MedVaccineInfo">
6	6	<result column="vi_id" property="viId" jdbcType="VARCHAR" />
7	7	<result column="vi_name" property="viName" jdbcType="VARCHAR" />
8	8	<result column="vi_factoryId" property="viFactoryId" jdbcType="VARCHAR" />
...	...	@@ -51,7 +51,7 @@
51	51
52	52
53	53
54		-<select id="queryMedVaccineinfo" resultMap="MedVaccineinfoResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedVaccineinfoQuery">
	54	+<select id="queryMedVaccineinfo" resultMap="MedVaccineinfoResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedVaccineInfoQuery">
55	55	select vi_id,vi_name,vi_factoryId,vi_vaccineNameId,vi_isValid
56	56	from med_vaccineinfo
57	57	<include refid="MedVaccineinfoCondition" />
...	...	@@ -60,7 +60,7 @@
60	60
61	61
62	62
63		-<select id="queryMedVaccineinfoCount" resultType="int" parameterType="com.lymsh.yimiao.main.data.model.MedVaccineinfoQuery">
	63	+<select id="queryMedVaccineinfoCount" resultType="int" parameterType="com.lymsh.yimiao.main.data.model.MedVaccineInfoQuery">
64	64	select count(1) from med_vaccineinfo
65	65	<include refid="MedVaccineinfoCondition" />
66	66	</select>

...	...	@@ -217,7 +217,7 @@
217	217	map.put("ioInoculateTime", medInoculateorder.getIoInoculateTime());
218	218	//下次接种疫苗
219	219	map.put("vaccineId", medInoculateorder.getIoVaccineId());
220		- MedVaccineinfo medVaccineinfo = medVaccineinfoService.getMedVaccineinfo(medInoculateorder.getIoVaccineId());
	220	+ MedVaccineInfo medVaccineinfo = medVaccineinfoService.getMedVaccineinfo(medInoculateorder.getIoVaccineId());
221	221	map.put("vaccineName", medVaccineinfo == null ? "" : medVaccineinfo.getViName());
222	222	//接种地点
223	223	map.put("organizationId", medInoculateorder.getIoOrganizationId());