jiangjiazhi / regional-platform

Commit 4ea15f6fb48a4a9b70ac19e9d84a1a6deb24fa4a

Authored by lkyyyds over 1 year ago

Exists in luanping and in 1 other branch

李科阳

Showing 7 changed files with 34 additions and 7 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseService.java
platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java
pom.xml

...	...	@@ -36,6 +36,7 @@
36	36	courseQuery.mysqlBuild(courseDao.queryCourseListCount(courseQuery.convertToQuery()));
37	37	query.start(courseQuery.getOffset()).end(courseQuery.getLimit());
38	38	}
	39	+
39	40	return courseDao.queryCourseList(query.addOrder(Sort.Direction.DESC, "modified"));
40	41	}
41	42

...	...	@@ -30,6 +30,7 @@
30	30
31	31
32	32	//课程结束时间
	33	+
33	34	private Date courseEndTime;
34	35
35	36	//时长

...	...	@@ -89,7 +89,7 @@
89	89
90	90	/**
91	91	* 转入、转出孕产妇 -- 转诊通知单打印
92		- * @param id
	92	+ * @param
93	93	* @return
94	94	*/
95	95	@RequestMapping(method = RequestMethod.GET, value = "/printRe")

...	...	@@ -25,6 +25,7 @@
25	25	import org.springframework.stereotype.Component;
26	26
27	27	import java.text.DecimalFormat;
	28	+import java.text.SimpleDateFormat;
28	29	import java.util.*;
29	30	import java.util.concurrent.Callable;
30	31	import java.util.concurrent.Future;
...	...	@@ -103,9 +104,13 @@
103	104	model.setCourseTypeId(request.getCourseTypeId());
104	105	model.setCourseTime(DateUtil.parseYMDHM(request.getCourseTime()));
105	106
106		- Integer longTime = request.getTimeLong() == null ? 0 : request.getTimeLong()601000;
107		-
108		- model.setCourseEndTime(new Date(DateUtil.parseYMDHM(request.getCourseTime()).getTime() + longTime));
	107	+ //判断CourseEndTime是否为空,如果不为空把前台传过来的值赋给CourseEndTime,前台传过来的是字符串,需要类型转换成Date
	108	+ if(request.getCourseEndTime()!= null) {
	109	+ model.setCourseEndTime(DateUtil.parseYMDHM(request.getCourseEndTime()));
	110	+ }else{
	111	+ Integer longTime = request.getTimeLong() == null ? 0 : request.getTimeLong()601000;
	112	+ model.setCourseEndTime(new Date(DateUtil.parseYMDHM(request.getCourseTime()).getTime() + longTime));
	113	+ }
109	114	model.setTimeLong(request.getTimeLong());
110	115	model.setLimitNum(request.getLimitNum());
111	116	model.setCourseSpeaker(request.getCourseSpeaker());
...	...	@@ -217,6 +222,7 @@
217	222	result.setStatus(CourseStatusEnums.getNameById(model.getStatus()));
218	223	result.setCourseRemark(model.getCourseRemark());
219	224	result.setCourseDesc(model.getCourseDesc());
	225	+ result.setCourseEndTime(DateUtil.gety_m_dhm(model.getCourseEndTime()));
220	226
221	227	String createUser = "";
222	228	Users users = usersService.getUsers(Integer.parseInt(model.getCreateUserId()));
...	...	@@ -622,7 +628,7 @@
622	628	totalData.put("allOrderRate", allSends == 0 ? 0 : df.format((double) allOrders / allSends * 100) + "%"); //总预约率
623	629	totalData.put("allSigns", allSigns);//总签到数
624	630	totalData.put("allSignRate", allOrders == 0 ? 0 : df.format((double) allSigns / allOrders * 100) + "%");//总签到率
625		-
	631	+ //TODO 孕妇听课率
626	632	CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
627	633	courseTypeQuery.setHospitalId(hospitalId);
628	634	courseTypeQuery.setYn(YnEnums.YES.getId());

1	1	package com.lyms.platform.operate.web.request;
2	2
3	3
	4	+import java.util.Date;
	5	+
4	6	/**
5	7	* Created by Administrator on 2018-02-05.
6	8	*/
7	9	public class CourseRequest {
8		-
9	10	private String id;
10	11	//课程名称
11	12	private String courseName;
12	13
...	...	@@ -38,9 +39,18 @@
38	39	private Integer courseObjId;
39	40
40	41	private String hospitalId;
	42	+ private String courseEndTime;
41	43
42	44	public Integer getCourseObjId() {
43	45	return courseObjId;
	46	+ }
	47	+
	48	+ public String getCourseEndTime() {
	49	+ return courseEndTime;
	50	+ }
	51	+
	52	+ public void setCourseEndTime(String courseEndTime) {
	53	+ this.courseEndTime = courseEndTime;
44	54	}
45	55
46	56	public void setCourseObjId(Integer courseObjId) {

...	...	@@ -58,6 +58,15 @@
58	58
59	59	private Integer courseTypeAvg;
60	60	private Integer courseDocAvg;
	61	+ private String courseEndTime;
	62	+
	63	+ public String getCourseEndTime() {
	64	+ return courseEndTime;
	65	+ }
	66	+
	67	+ public void setCourseEndTime(String courseEndTime) {
	68	+ this.courseEndTime = courseEndTime;
	69	+ }
61	70
62	71	public String getCourseSpeakerId() {
63	72	return courseSpeakerId;

...	...	@@ -587,7 +587,7 @@
587	587	<dependency>
588	588	<groupId>com.oracle</groupId>
589	589	<artifactId>ojdbc14</artifactId>
590		- <version>11.2.0.1.0</version>
	590	+ <version>11.2.0.1.0</version>
591	591	</dependency>
592	592	<dependency>
593	593	<groupId>commons-dbutils</groupId>