Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -1,8 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
-import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.io.Serializable;
 import java.util.Date;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercises.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.auth.api.entity.SysUser;
+
 /**
  * 对应数据库表(extracurricular_exercises):
  */
@@ -13,6 +15,8 @@ public class ExtracurricularExercises {
 	/** 老师编号 */
 	private Integer teacherId;
 	
+	private SysUser teacher = new SysUser();
+	
 	/** 学生列表 */
 	private String studentIdList;
 	
@@ -159,6 +163,14 @@ public class ExtracurricularExercises {
 		return this.updateTime;
 	}
 			
+	public SysUser getTeacher() {
+		return teacher;
+	}
+
+	public void setTeacher(SysUser teacher) {
+		this.teacher = teacher;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercisesReply.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.auth.api.entity.SysUser;
+
 /**
  * 对应数据库表(extracurricular_exercises_reply):
  */
@@ -16,6 +18,8 @@ public class ExtracurricularExercisesReply {
 	/**  */
 	private Integer userId;
 	
+	private SysUser user = new SysUser();
+	
 	/** 作品附件 */
 	private String attachments;
 	
@@ -117,6 +121,14 @@ public class ExtracurricularExercisesReply {
 		return this.isView;
 	}
 			
+	public SysUser getUser() {
+		return user;
+	}
+
+	public void setUser(SysUser user) {
+		this.user = user;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExtraExercilseReplyQueryInfo.java

@@ -0,0 +1,62 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/3/26
+ */
+public class ExtraExercilseReplyQueryInfo extends QueryInfo {
+
+	private Integer teacherId;
+
+	private Integer studentId;
+
+	private String title;
+
+	private Date submitStartTime;// 提交作业的开始时间
+
+	private Date submitEndTime;// 提交作业的结束时间
+
+	public Integer getTeacherId() {
+		return teacherId;
+	}
+
+	public void setTeacherId(Integer teacherId) {
+		this.teacherId = teacherId;
+	}
+
+	public Integer getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Integer studentId) {
+		this.studentId = studentId;
+	}
+
+	public Date getSubmitStartTime() {
+		return submitStartTime;
+	}
+
+	public void setSubmitStartTime(Date submitStartTime) {
+		this.submitStartTime = submitStartTime;
+	}
+
+	public Date getSubmitEndTime() {
+		return submitEndTime;
+	}
+
+	public void setSubmitEndTime(Date submitEndTime) {
+		this.submitEndTime = submitEndTime;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+}

mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesMapper.xml

@@ -9,6 +9,7 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.ExtracurricularExercises" id="ExtracurricularExercises">
 		<result column="id_" property="id" />
 		<result column="teacher_id_" property="teacherId" />
+		<result column="username_" property="teacher.username" />
 		<result column="student_id_list_" property="studentIdList" />
 		<result column="batch_no_" property="batchNo" />
 		<result column="title_" property="title" />
@@ -33,10 +34,10 @@
 				batch_no_ = #{batchNo}
 			</if>
 			<if test="assignStartTime != null">
-				AND create_time_ &gt;= #{assignStartTime}
+				AND ee.create_time_ &gt;= #{assignStartTime}
 			</if>
 			<if test="assignEndTime != null">
-				AND create_time_ &lt;= #{assignEndTime}
+				AND ee.create_time_ &lt;= #{assignEndTime}
 			</if>
 		</where>
 	</sql>
@@ -107,14 +108,14 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
-		SELECT * FROM extracurricular_exercises 
+		SELECT ee.*,u.username_ FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
 		<include refid="queryPageCondition"/>
 		ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM extracurricular_exercises
+		SELECT COUNT(ee.id_) FROM extracurricular_exercises ee
 		<include refid="queryPageCondition"/>
 	</select>
 

mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesReplyMapper.xml

@@ -10,6 +10,7 @@
 		<result column="id_" property="id" />
 		<result column="extracurricular_exercises_id_" property="extracurricularExercisesId" />
 		<result column="user_id_" property="userId" />
+		<result column="username_" property="user.username" />
 		<result column="attachments_" property="attachments" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -27,6 +28,26 @@
 		<result column="content_" property="content"/>
 		<result column="expire_date_" property="expireDate"/>
 	</resultMap>
+
+	<sql id="queryPageCondition">
+		<where>
+			<if test="teacherId != null">
+				teacher_id_ = #{teacherId}
+			</if>
+			<if test="studentId != null">
+				user_id_ = #{studentId}
+			</if>
+			<if test="title != null">
+				title_ = #{title}
+			</if>
+			<if test="submitStartTime != null">
+				AND eer.create_time_ &gt;= #{submitStartTime}
+			</if>
+			<if test="submitEndTime != null">
+				AND eer.create_time_ &lt;= #{submitEndTime}
+			</if>
+		</where>
+	</sql>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ExtracurricularExercisesReply" >
@@ -97,13 +118,18 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercisesReply" parameterType="map">
-		SELECT * FROM extracurricular_exercises_reply ORDER BY id_ <include refid="global.limit"/>
+		SELECT eer.*,u.username_ FROM extracurricular_exercises_reply eer left join extracurricular_exercises ee on eer.extracurricular_exercises_id_ = ee.id_
+		left join sys_user u on eer.user_id_ = u.id_
+		<include refid="queryPageCondition"/>
+		 ORDER BY eer.id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM extracurricular_exercises_reply
+		SELECT COUNT(eer.id_) FROM extracurricular_exercises_reply eer left join extracurricular_exercises ee on eer.extracurricular_exercises_id_ = ee.id_
+		<include refid="queryPageCondition"/>
 	</select>
+	
 	<select id="findExtraExerciseStudents" resultMap="ExtraExerciseStudentsDto">
 		SELECT
 			eer.*,

mec-web/src/main/java/com/ym/mec/web/controller/ExtracurricularExercisesMessageController.java

@@ -1,29 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.ExtracurricularExercisesMessage;
-import com.ym.mec.biz.service.ExtracurricularExercisesMessageService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Author Joburgess
- * @Date 2020/3/26
- */
-@Api(tags = "课外训练评论服务")
-@RequestMapping("extracurricularExercisesMessage")
-@RestController
-public class ExtracurricularExercisesMessageController extends BaseController {
-
-    @Autowired
-    private ExtracurricularExercisesMessageService extracurricularExercisesMessageService;
-
-}

mec-web/src/main/java/com/ym/mec/web/controller/ExtracurricularExercisesReplyController.java

@@ -0,0 +1,29 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.page.ExtraExercilseReplyQueryInfo;
+import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+
+@Api(tags = "课外训练学生作业服务")
+@RequestMapping("extracurricularExercisesReply")
+@RestController
+public class ExtracurricularExercisesReplyController extends BaseController {
+
+    @Autowired
+    private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
+
+    @ApiOperation(value = "获取课外训练作业列表")
+    @GetMapping("/queryPageList")
+    private HttpResponseResult findExtraExercilses(ExtraExercilseReplyQueryInfo queryInfo){
+        return succeed(extracurricularExercisesReplyService.queryPage(queryInfo));
+    }
+}