jiangjiazhi / regional-platform

Commit 9f88cc2af7eb19939aa312d300c7389747ee74d7

Authored by Administrator over 6 years ago

1 parent b65a21992a

Exists in master and in 6 other branches

bug update

Showing 7 changed files with 134 additions and 80 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
platform-dal/pom.xml
platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java
platform-operate-api/pom.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java

...	...	@@ -136,80 +136,79 @@
136	136	</select>
137	137
138	138	<insert id="saveFolvite" parameterType="com.lyms.platform.pojo.FolviteRecordModel">
139		-INSERT INTO lyms_folvite_Info (
140		- id,
141		- NAME,
142		- sex,
143		- birthday,
144		- nationality,
145		- nation,
146		- marital_status,
147		- certificate_type,
148		- card_no,
149		- census_type,
150		- live_type,
151		- education,
152		- occupation,
153		- phone,
154		- work_unit,
155		- habitation_province,
156		- habitation_city,
157		- habitation_area,
158		- habitation_country,
159		- habitation_address,
160		- domicile_province,
161		- domicile_city,
162		- domicile_area,
163		- domicile_country,
164		- domicile_address,
165		- woman_id,
166		- isconceive,
167		- lastmenstrual,
168		- ispregnancy,
169		- operation_doctor,
170		- created,
171		- vc_card,
172		- hospitalid,
173		- receivesum,
174		- drawTime
175		-)
176		-VALUES
177		- (
178		- #{id,jdbcType=VARCHAR},
179		- #{name,jdbcType=VARCHAR},
180		- #{sex,jdbcType=BIGINT},
181		- #{birthday,jdbcType=TIMESTAMP},
182		- #{nationality,jdbcType=VARCHAR},
183		- #{nation,jdbcType=VARCHAR},
184		- #{maritalStatus,jdbcType=VARCHAR},
185		- #{certificateType,jdbcType=VARCHAR},
186		- #{cardNo,jdbcType=VARCHAR},
187		- #{censusType,jdbcType=VARCHAR},
188		- #{liveType,jdbcType=VARCHAR},
189		- #{education,jdbcType=VARCHAR},
190		- #{occupation,jdbcType=VARCHAR},
191		- #{phone,jdbcType=VARCHAR},
192		- #{workUnit,jdbcType=VARCHAR},
193		- #{habitationProvince,jdbcType=VARCHAR},
194		- #{habitationCity,jdbcType=VARCHAR},
195		- #{habitationArea,jdbcType=VARCHAR},
196		- #{habitationCountry,jdbcType=VARCHAR},
197		- #{habitationAddress,jdbcType=VARCHAR},
198		- #{domicileProvince,jdbcType=VARCHAR},
199		- #{domicileCity,jdbcType=VARCHAR},
200		- #{domicileArea,jdbcType=VARCHAR},
201		- #{domicileCountry,jdbcType=VARCHAR},
202		- #{domicileAddress,jdbcType=VARCHAR},
203		- #{womanId,jdbcType=VARCHAR},
204		- #{isconceive,jdbcType=BIGINT},
205		- #{lastmenstrual,jdbcType=TIMESTAMP},
206		- #{ispregnancy,jdbcType=BIGINT},
207		- #{operationDoctor,jdbcType=VARCHAR},
208		- #{created,jdbcType=TIMESTAMP},
209		- #{vcCard,jdbcType=VARCHAR},
210		- #{hospitalid,jdbcType=VARCHAR},
211		- #{receivesum,jdbcType=INTEGER})
212		- #{drawTime,jdbcType=TIMESTAMP}
	139	+INSERT INTO lyms_folvite_Info(
	140	+id,
	141	+name,
	142	+sex,
	143	+birthday,
	144	+nationality,
	145	+nation,
	146	+marital_status,
	147	+certificate_type,
	148	+card_no,
	149	+census_type,
	150	+live_type,
	151	+education,
	152	+occupation,
	153	+phone,
	154	+work_unit,
	155	+habitation_province,
	156	+habitation_city,
	157	+habitation_area,
	158	+habitation_country,
	159	+habitation_address,
	160	+domicile_province,
	161	+domicile_city,
	162	+domicile_area,
	163	+domicile_country,
	164	+domicile_address,
	165	+woman_id,
	166	+isconceive,
	167	+lastmenstrual,
	168	+ispregnancy,
	169	+operation_doctor,
	170	+created,
	171	+vc_card,
	172	+hospitalid,
	173	+receivesum,
	174	+modify,
	175	+drawTime ) VALUES (
	176	+#{id,jdbcType=VARCHAR},
	177	+#{name,jdbcType=VARCHAR},
	178	+#{sex,jdbcType=BIGINT},
	179	+#{birthday,jdbcType=TIMESTAMP},
	180	+#{nationality,jdbcType=VARCHAR},
	181	+#{nation,jdbcType=VARCHAR},
	182	+#{maritalStatus,jdbcType=VARCHAR},
	183	+#{certificateType,jdbcType=VARCHAR},
	184	+#{cardNo,jdbcType=VARCHAR},
	185	+#{censusType,jdbcType=VARCHAR},
	186	+#{liveType,jdbcType=VARCHAR},
	187	+#{education,jdbcType=VARCHAR},
	188	+#{occupation,jdbcType=VARCHAR},
	189	+#{phone,jdbcType=VARCHAR},
	190	+#{workUnit,jdbcType=VARCHAR},
	191	+#{habitationProvince,jdbcType=VARCHAR},
	192	+#{habitationCity,jdbcType=VARCHAR},
	193	+#{habitationArea,jdbcType=VARCHAR},
	194	+#{habitationCountry,jdbcType=VARCHAR},
	195	+#{habitationAddress,jdbcType=VARCHAR},
	196	+#{domicileProvince,jdbcType=VARCHAR},
	197	+#{domicileCity,jdbcType=VARCHAR},
	198	+#{domicileArea,jdbcType=VARCHAR},
	199	+#{domicileCountry,jdbcType=VARCHAR},
	200	+#{domicileAddress,jdbcType=VARCHAR},
	201	+#{womanId,jdbcType=VARCHAR},
	202	+#{isconceive,jdbcType=BIGINT},
	203	+#{lastmenstrual,jdbcType=TIMESTAMP},
	204	+#{ispregnancy,jdbcType=BIGINT},
	205	+#{operationDoctor,jdbcType=VARCHAR},
	206	+#{created,jdbcType=TIMESTAMP},
	207	+#{vcCard,jdbcType=VARCHAR},
	208	+#{hospitalId,jdbcType=VARCHAR},
	209	+#{receiveSum,jdbcType=INTEGER},
	210	+#{modify,jdbcType=TIMESTAMP},
	211	+#{drawTime,jdbcType=TIMESTAMP})
213	212	</insert>
214	213
215	214

...	...	@@ -16,7 +16,13 @@
16	16	<artifactId>platform-common</artifactId>
17	17	<version>1.0.1</version>
18	18	</dependency>
19		- </dependencies>
	19	+ <dependency>
	20	+ <groupId>com.fasterxml.jackson.core</groupId>
	21	+ <artifactId>jackson-annotations</artifactId>
	22	+ <version>2.9.0</version>
	23	+ <scope>compile</scope>
	24	+ </dependency>
	25	+ </dependencies>
20	26	<build>
21	27	<plugins>
22	28	<plugin>

1	1	package com.lyms.platform.pojo;
2	2
	3	+
	4	+import com.fasterxml.jackson.annotation.JsonFormat;
	5	+import org.apache.commons.lang.time.DateUtils;
	6	+
3	7	import java.util.Date;
4		-import java.util.UUID;
5	8
6	9	/**
7	10	* 叶酸建档记录
...	...	@@ -105,7 +108,8 @@
105	108	private String operationDoctor;
106	109
107	110	//建档日期
108		- private String drawTime;
	111	+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	112	+ private Date drawTime;
109	113
110	114	//创建时间
111	115	private Date created;
112	116
...	...	@@ -128,11 +132,11 @@
128	132	}
129	133
130	134
131		- public String getDrawTime() {
	135	+ public Date getDrawTime() {
132	136	return drawTime;
133	137	}
134	138
135		- public void setDrawTime(String drawTime) {
	139	+ public void setDrawTime(Date drawTime) {
136	140	this.drawTime = drawTime;
137	141	}
138	142

...	...	@@ -102,6 +102,23 @@
102	102	<artifactId>jxl</artifactId>
103	103	<version>2.6.12</version>
104	104	</dependency>
	105	+ <dependency>
	106	+ <groupId>com.fasterxml.jackson.core</groupId>
	107	+ <artifactId>jackson-annotations</artifactId>
	108	+ <version>2.8.8</version>
	109	+ </dependency>
	110	+
	111	+ <dependency>
	112	+ <groupId>com.fasterxml.jackson.core</groupId>
	113	+ <artifactId>jackson-databind</artifactId>
	114	+ <version>2.8.8</version>
	115	+ </dependency>
	116	+
	117	+ <dependency>
	118	+ <groupId>org.codehaus.jackson</groupId>
	119	+ <artifactId>jackson-mapper-asl</artifactId>
	120	+ <version>1.9.13</version>
	121	+ </dependency>
105	122
106	123	<!-- https://mvnrepository.com/artifact/freemarker/freemarker -->
107	124	<!-- <dependency>

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.common.base.BaseController;
5	5	import com.lyms.platform.common.result.BaseResponse;
6	6	import com.lyms.platform.operate.web.service.FolviteService;
	7	+import com.lyms.platform.permission.model.FolviteQuery;
7	8	import com.lyms.platform.pojo.FolviteReceiveRecordModel;
8	9	import com.lyms.platform.pojo.FolviteRecordModel;
9	10	import org.springframework.beans.factory.annotation.Autowired;
...	...	@@ -11,6 +12,7 @@
11	12	import org.springframework.web.bind.annotation.*;
12	13
13	14	import javax.servlet.http.HttpServletRequest;
	15	+import javax.validation.Valid;
14	16
15	17	/**
16	18	* 叶酸接口
17	19
18	20
19	21
...	...	@@ -74,11 +76,30 @@
74	76
75	77	}
76	78
	79	+ /**
	80	+ * 通过叶酸接口发放叶酸记录
	81	+ *
	82	+ * @param id
	83	+ * @param request
	84	+ * @return
	85	+ */
77	86	@RequestMapping(value = "queryOneProvide/{id}", method = RequestMethod.GET)
	87	+ @ResponseBody
	88	+ @TokenRequired
78	89	public BaseResponse queryOneProvide(@PathVariable("id") String id, HttpServletRequest request) {
79		-
80	90	return folviteService.queryOneProvide(id, getUserId(request));
81	91	}
	92	+
	93	+
	94	+ @RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
	95	+ @ResponseBody
	96	+ @TokenRequired
	97	+ public BaseResponse queryFolviteList(@Valid @RequestBody FolviteQuery query) {
	98	+
	99	+
	100	+ return null;
	101	+ }
	102	+
82	103
83	104	}

...	...	@@ -55,5 +55,7 @@
55	55	List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery);
56	56
57	57	List<FolviteReceiveRecordModel> queryFolviteReceiveList(FolviteRecordQuery query);
	58	+
	59	+ List<FolviteRecordModel> list(FolviteQuery folviteQuery);
58	60	}

...	...	@@ -236,6 +236,11 @@
236	236	return receiveMapper.queryFolviteReceiveList(query);
237	237	}
238	238
	239	+ @Override
	240	+ public List<FolviteRecordModel> list(FolviteQuery folviteQuery) {
	241	+ return null;
	242	+ }
	243	+
239	244	FolviteResult result(ResidentsArchiveModel archiveModel) {
240	245	FolviteResult folviteResult = new FolviteResult();
241	246	folviteResult.setWomanId(archiveModel.getId());