update

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

@@ -77,11 +77,29 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ActivityUserMapperAdjustLog" parameterType="map">
-		SELECT * FROM activity_user_mapper_adjust_log ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM activity_user_mapper_adjust_log
+		<where>
+			<if test="userId != null">
+				AND user_id_ = #{userId}
+			</if>
+			<if test="activityId != null">
+				AND activity_id_ = #{activityId}
+			</if>
+		</where>
+		ORDER BY id_
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM activity_user_mapper_adjust_log
+		<where>
+			<if test="userId != null">
+				AND user_id_ = #{userId}
+			</if>
+			<if test="activityId != null">
+				AND activity_id_ = #{activityId}
+			</if>
+		</where>
 	</select>
 </mapper>

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

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.Student" id="Student">
         <result column="user_id_" property="userId"/>
         <result column="subject_id_list_" property="subjectIdList"/>
+        <result column="subject_name_" property="subjectNames"/>
         <result column="service_tag_" property="serviceTag"/>
         <result column="operating_tag_" property="operatingTag"/>
         <result column="operating_temp_tag_" property="operatingTempTag"/>
@@ -1377,9 +1378,10 @@
     </update>
 
     <select id="queryStudent" resultMap="Student">
-        SELECT s.*,su.username_,su.phone_,o.name_ organ_name_ FROM student s
+        SELECT s.*,su.username_,su.phone_,o.name_ organ_name_,sb.name_ subject_name_ FROM student s
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         LEFT JOIN organization o ON o.id_ = su.organ_id_
+        LEFT JOIN subject sb ON sb.id_ = s.subject_id_list_
         <where>
             <if test="studentIds != null and studentIds.size > 0">
                 AND s.user_id_ IN

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

@@ -0,0 +1,27 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.page.ActivityStudentQueryInfo;
+import com.ym.mec.biz.service.ActivityUserMapperAdjustLogService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "学员活动排课记录服务")
+@RequestMapping("activityUserMapperAdjustLog")
+@RestController
+public class ActivityUserMapperAdjustLogController extends BaseController {
+
+    @Autowired
+    private ActivityUserMapperAdjustLogService activityUserMapperAdjustLogService;
+
+    @ApiOperation(value = "获取列表")
+    @RequestMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('activityUserMapperAdjustLog/queryPage')")
+    public Object queryPage(ActivityStudentQueryInfo queryInfo){
+        return succeed(activityUserMapperAdjustLogService.queryPage(queryInfo));
+    }
+}