jiangjiazhi / regional-platform

Commit 8f7c4ada06956ff2ffc1cb26da1de54eedf476b7

Authored by zhangchao 10 months ago

Exists in dev

#fix:优化儿保小程序意见反馈，新增字段

Showing 3 changed files with 53 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyFeedbackModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FeedbackFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java

...	...	@@ -17,6 +17,10 @@
17	17	private String publishId;
18	18	//反馈人名称
19	19	private String publishName;
	20	+
	21	+ private String cardNo;
	22	+ private String phone;
	23	+
20	24	//1.有效 2.无效
21	25	private Integer yn;
22	26	//最后修改时间
...	...	@@ -32,6 +36,22 @@
32	36
33	37	//回复内容
34	38	private String callBack;
	39	+
	40	+ public String getCardNo() {
	41	+ return cardNo;
	42	+ }
	43	+
	44	+ public void setCardNo(String cardNo) {
	45	+ this.cardNo = cardNo;
	46	+ }
	47	+
	48	+ public String getPhone() {
	49	+ return phone;
	50	+ }
	51	+
	52	+ public void setPhone(String phone) {
	53	+ this.phone = phone;
	54	+ }
35	55
36	56	public String getCallBack() {
37	57	return callBack;

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.platform.biz.service.BabyService;
3	4	import com.lyms.platform.biz.service.FeedbackService;
4	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	6	import com.lyms.platform.common.enums.YnEnums;
...	...	@@ -7,6 +8,7 @@
7	8	import com.lyms.platform.common.result.BaseResponse;
8	9	import com.lyms.platform.common.utils.DateUtil;
9	10	import com.lyms.platform.pojo.BabyFeedbackModel;
	11	+import com.lyms.platform.pojo.BabyModel;
10	12	import com.lyms.platform.query.FeedbackQuery;
11	13	import org.apache.commons.lang.StringUtils;
12	14	import org.springframework.beans.factory.annotation.Autowired;
...	...	@@ -21,6 +23,8 @@
21	23	private FeedbackService feedbackService;
22	24	@Autowired
23	25	private AutoMatchFacade autoMatchFacade;
	26	+ @Autowired
	27	+ private BabyService babyService;
24	28
25	29	public BaseResponse getPageList(Integer page, Integer limit,
26	30	Integer type,String startTime,String endTime,Integer userId){
...	...	@@ -66,6 +70,9 @@
66	70	BaseResponse objectResponse = new BaseResponse();
67	71	model.setCreated(new Date());
68	72	model.setYn(YnEnums.YES.getId());
	73	+ BabyModel babyModel= babyService.getOneBabyById(model.getPublishId());
	74	+ model.setCardNo(babyModel.getCardNo());
	75	+ model.setPhone(babyModel.getMphone());
69	76	feedbackService.add(model);
70	77	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
71	78	objectResponse.setErrormsg("成功");
...	...	@@ -74,6 +81,11 @@
74	81
75	82	public BaseResponse update(BabyFeedbackModel model) {
76	83	BaseResponse objectResponse = new BaseResponse();
	84	+ if (StringUtils.isEmpty(model.getCardNo())){
	85	+ BabyModel babyModel= babyService.getOneBabyById(model.getPublishId());
	86	+ model.setCardNo(babyModel.getCardNo());
	87	+ model.setPhone(babyModel.getMphone());
	88	+ }
77	89	feedbackService.update(model);
78	90	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
79	91	objectResponse.setErrormsg("成功");

...	...	@@ -40,6 +40,11 @@
40	40	* @discription 丈夫姓名
41	41	*/
42	42	private String husbandName;
	43	+ //丈夫年龄
	44	+ private Integer hmarriageAge;
	45	+ //丈夫生日
	46	+ private Date husbandBirth;
	47	+
43	48	//丈夫电话
44	49	private String husbandPhone;
45	50	//证件号
...	...	@@ -100,6 +105,22 @@
100	105	private String lastName;
101	106	//病历号(住院号)
102	107	private String blNo;
	108	+
	109	+ public Integer getHmarriageAge() {
	110	+ return DateUtil.getAge(husbandBirth);
	111	+ }
	112	+
	113	+ public void setHmarriageAge(Integer hmarriageAge) {
	114	+ this.hmarriageAge = hmarriageAge;
	115	+ }
	116	+
	117	+ public Date getHusbandBirth() {
	118	+ return husbandBirth;
	119	+ }
	120	+
	121	+ public void setHusbandBirth(Date husbandBirth) {
	122	+ this.husbandBirth = husbandBirth;
	123	+ }
103	124
104	125	public String getFirstName() {
105	126	return firstName;