jiangjiazhi / regional-platform

Commit 167ff8d5f3f60add3d2dd15cd069edd01b2fb663

Authored by jiangjiazhi almost 8 years ago

Exists in master and in 6 other branches

commit

Showing 5 changed files with 66 additions and 35 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ChildrenPersonMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/ChildrenFather.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/ChildrenPerson.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/ChildrenPersonService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ChildrenPersonServiceImpl.java

...	...	@@ -7,7 +7,7 @@
7	7
8	8	public interface ChildrenPersonMapper
9	9	{
10		- public void addChildrenPerson(ChildrenPerson obj);
	10	+ public ChildrenPerson addChildrenPerson(ChildrenPerson obj);
11	11
12	12	public void updateChildrenPerson(ChildrenPerson obj);
13	13

...	...	@@ -9,8 +9,8 @@
9	9	private String name;
10	10	private String contactWay;
11	11	private Date birthday;
12		- private Integer educationDegree;
13		- private Integer occupation;
	12	+ private String educationDegree;
	13	+ private String occupation;
14	14	private Date createTime;
15	15
16	16	public String getId()
17	17
18	18
19	19
...	...	@@ -73,25 +73,25 @@
73	73
74	74	}
75	75
76		- public Integer getEducationDegree()
	76	+ public String getEducationDegree()
77	77	{
78	78	return educationDegree;
79	79	}
80	80
81	81
82		- public void setEducationDegree(Integer educationDegree)
	82	+ public void setEducationDegree(String educationDegree)
83	83	{
84	84	this.educationDegree = educationDegree;
85	85
86	86	}
87	87
88		- public Integer getOccupation()
	88	+ public String getOccupation()
89	89	{
90	90	return occupation;
91	91	}
92	92
93	93
94		- public void setOccupation(Integer occupation)
	94	+ public void setOccupation(String occupation)
95	95	{
96	96	this.occupation = occupation;
97	97

...	...	@@ -16,15 +16,15 @@
16	16	private String addressStreet;
17	17	private String addressDetail;
18	18	private Date createTime;
19		- private Integer doctorId;
	19	+ private String doctorId;
20	20	private Integer ifDel;
21	21	private String baseWomanName;
22		- private Integer basePapersType;
	22	+ private String basePapersType;
23	23	private String basePapersNumber;
24	24	private Date baseWomanBirth;
25	25	private String contactWomanWay;
26		- private Integer degree;
27		- private Integer occupation;
	26	+ private String degree;
	27	+ private String occupation;
28	28
29	29	public String getId()
30	30	{
31	31
...	...	@@ -170,13 +170,13 @@
170	170
171	171	}
172	172
173		- public Integer getDoctorId()
	173	+ public String getDoctorId()
174	174	{
175	175	return doctorId;
176	176	}
177	177
178	178
179		- public void setDoctorId(Integer doctorId)
	179	+ public void setDoctorId(String doctorId)
180	180	{
181	181	this.doctorId = doctorId;
182	182
183	183
...	...	@@ -206,13 +206,13 @@
206	206
207	207	}
208	208
209		- public Integer getBasePapersType()
	209	+ public String getBasePapersType()
210	210	{
211	211	return basePapersType;
212	212	}
213	213
214	214
215		- public void setBasePapersType(Integer basePapersType)
	215	+ public void setBasePapersType(String basePapersType)
216	216	{
217	217	this.basePapersType = basePapersType;
218	218
219	219
220	220
221	221
...	...	@@ -254,25 +254,25 @@
254	254
255	255	}
256	256
257		- public Integer getDegree()
	257	+ public String getDegree()
258	258	{
259	259	return degree;
260	260	}
261	261
262	262
263		- public void setDegree(Integer degree)
	263	+ public void setDegree(String degree)
264	264	{
265	265	this.degree = degree;
266	266
267	267	}
268	268
269		- public Integer getOccupation()
	269	+ public String getOccupation()
270	270	{
271	271	return occupation;
272	272	}
273	273
274	274
275		- public void setOccupation(Integer occupation)
	275	+ public void setOccupation(String occupation)
276	276	{
277	277	this.occupation = occupation;
278	278

...	...	@@ -5,7 +5,18 @@
5	5
6	6	import java.util.List;
7	7
8		-public interface ChildrenPersonService {public void addChildrenPerson(ChildrenPerson obj);public void updateChildrenPerson(ChildrenPerson obj);public void deleteChildrenPerson(String id);public ChildrenPerson getChildrenPerson(String id);public int queryChildrenPersonCount(ChildrenPersonQuery query);public List<ChildrenPerson> queryChildrenPerson(ChildrenPersonQuery query);
	8	+public interface ChildrenPersonService {
	9	+ public ChildrenPerson addChildrenPerson(ChildrenPerson obj);
	10	+
	11	+ public void updateChildrenPerson(ChildrenPerson obj);
	12	+
	13	+ public void deleteChildrenPerson(String id);
	14	+
	15	+ public ChildrenPerson getChildrenPerson(String id);
	16	+
	17	+ public int queryChildrenPersonCount(ChildrenPersonQuery query);
	18	+
	19	+ public List<ChildrenPerson> queryChildrenPerson(ChildrenPersonQuery query);
9	20
10	21	}

...	...	@@ -13,21 +13,41 @@
13	13	@Service
14	14	public class ChildrenPersonServiceImpl implements ChildrenPersonService {
15	15
16		-@Autowired
17		-private ChildrenPersonMapper childrenPersonMapper;
	16	+ @Autowired
	17	+ private ChildrenPersonMapper childrenPersonMapper;
18	18
19		-@Override
20		-public void addChildrenPerson(ChildrenPerson obj){childrenPersonMapper.addChildrenPerson(obj);}
21		-@Override
22		-public void updateChildrenPerson(ChildrenPerson obj){childrenPersonMapper.updateChildrenPerson(obj);}
23		-@Override
24		-public void deleteChildrenPerson (String id){childrenPersonMapper.deleteChildrenPerson(id);}
25		-@Override
26		-public ChildrenPerson getChildrenPerson (String id){return childrenPersonMapper.getChildrenPerson(id);}
27		-@Override
28		-public int queryChildrenPersonCount (ChildrenPersonQuery query){return childrenPersonMapper.queryChildrenPersonCount(query);}
29		-@Override
30		-public List<ChildrenPerson> queryChildrenPerson (ChildrenPersonQuery query){if (query.getNeed() != null) {query.mysqlBuild(childrenPersonMapper.queryChildrenPersonCount(query));}return childrenPersonMapper.queryChildrenPerson(query);}
	19	+ @Override
	20	+ public ChildrenPerson addChildrenPerson(ChildrenPerson obj) {
	21	+ return childrenPersonMapper.addChildrenPerson(obj);
	22	+ }
	23	+
	24	+ @Override
	25	+ public void updateChildrenPerson(ChildrenPerson obj) {
	26	+ childrenPersonMapper.updateChildrenPerson(obj);
	27	+ }
	28	+
	29	+ @Override
	30	+ public void deleteChildrenPerson(String id) {
	31	+ childrenPersonMapper.deleteChildrenPerson(id);
	32	+ }
	33	+
	34	+ @Override
	35	+ public ChildrenPerson getChildrenPerson(String id) {
	36	+ return childrenPersonMapper.getChildrenPerson(id);
	37	+ }
	38	+
	39	+ @Override
	40	+ public int queryChildrenPersonCount(ChildrenPersonQuery query) {
	41	+ return childrenPersonMapper.queryChildrenPersonCount(query);
	42	+ }
	43	+
	44	+ @Override
	45	+ public List<ChildrenPerson> queryChildrenPerson(ChildrenPersonQuery query) {
	46	+ if (query.getNeed() != null) {
	47	+ query.mysqlBuild(childrenPersonMapper.queryChildrenPersonCount(query));
	48	+ }
	49	+ return childrenPersonMapper.queryChildrenPerson(query);
	50	+ }
31	51
32	52	}