jiangjiazhi / regional-platform

Commit 846679852233cb64b97aca7211b40c2e370b79fd

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

修复bug

Showing 2 changed files with 28 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java

...	...	@@ -15,6 +15,8 @@
15	15	import javax.servlet.http.HttpServletRequest;
16	16	import javax.servlet.http.HttpServletResponse;
17	17	import javax.validation.Valid;
	18	+import java.util.Calendar;
	19	+import java.util.Date;
18	20
19	21
20	22	/**
21	23
...	...	@@ -158,10 +160,32 @@
158	160	@TokenRequired
159	161	public BaseResponse settleStatus(@Valid @RequestBody BabyNutritionSettleRequest request,
160	162	HttpServletRequest httpServletRequest) {
	163	+ getStartTimeAndEndTime(request);
161	164	return babyNutritionFacade.settleStatus(request, getUserId(httpServletRequest));
162	165	}
163	166
164	167	/**
	168	+ * 时差设置
	169	+ *
	170	+ * @param request
	171	+ */
	172	+ private void getStartTimeAndEndTime(@RequestBody @Valid BabyNutritionSettleRequest request) {
	173	+ Date startTime = request.getStartTime();
	174	+ if (startTime != null){
	175	+ request.setStartTime(new Date(startTime.getTime() - 28800000));
	176	+ }
	177	+ Date endTime = request.getEndTime();
	178	+ if (endTime != null) {
	179	+ Calendar todayEnd = Calendar.getInstance();
	180	+ todayEnd.setTime(new Date(endTime.getTime() - 28800000));
	181	+ todayEnd.set(Calendar.HOUR_OF_DAY, 23);
	182	+ todayEnd.set(Calendar.MINUTE, 59);
	183	+ todayEnd.set(Calendar.SECOND, 59);
	184	+ request.setEndTime(todayEnd.getTime());
	185	+ }
	186	+ }
	187	+
	188	+ /**
165	189	* 结算历史
166	190	*
167	191	* @param request
...	...	@@ -172,6 +196,7 @@
172	196	@TokenRequired
173	197	public BaseResponse settleHistoryList(@Valid @RequestBody BabyNutritionSettleRequest request,
174	198	HttpServletRequest httpServletRequest) {
	199	+ getStartTimeAndEndTime(request);
175	200	return babyNutritionFacade.settleHistoryList(request, getUserId(httpServletRequest));
176	201	}
177	202
...	...	@@ -185,6 +210,7 @@
185	210	@TokenRequired
186	211	public void settleHistoryExport(@Valid @RequestBody BabyNutritionSettleRequest request,
187	212	HttpServletResponse response) {
	213	+ getStartTimeAndEndTime(request);
188	214	babyNutritionFacade.settleHistoryExport(request,response);
189	215	}
190	216

...	...	@@ -1212,7 +1212,7 @@
1212	1212	int week = differentDays / 7;
1213	1213	map.put("openYumSize", week);
1214	1214	} else {
1215		- map.put("opeYumSize","");
	1215	+ map.put("openYumSize","");
1216	1216	}
1217	1217
1218	1218
...	...	@@ -1222,7 +1222,7 @@
1222	1222	if (babyModel != null){
1223	1223	userName = babyModel.getName();
1224	1224	}
1225		- map.put("opnYumSize", "");
	1225	+ map.put("openYumSize", "");
1226	1226	map.put("serviceWeek", "");
1227	1227	}
1228	1228	map.put("patientName", userName);