update

edu-common/src/main/java/com/keao/edu/common/dal/BaseDAO.java

@@ -7,6 +7,8 @@
  */
 package com.keao.edu.common.dal;
 
+import org.apache.ibatis.annotations.Param;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -68,4 +70,8 @@ public interface BaseDAO<PK extends Serializable, T>{
 	 * @return
 	 */
 	public int queryCount(Map<String, Object> params);
+
+	<K extends List> List<Map> getMaps(@Param("columnKey") String columnKey,
+							  @Param("columnValue") String columnValue,
+							  @Param("ids") K ids);
 }

edu-common/src/main/java/com/keao/edu/common/service/BaseService.java

@@ -70,5 +70,7 @@ public interface BaseService<PK extends Serializable, T> {
 	 * @return
 	 */
 	public int findCount(Map<String, Object> params);
+
+	<K extends List> Map getMap(String columnKey, String columnValue, K ids);
 	
 }

edu-common/src/main/java/com/keao/edu/common/service/impl/BaseServiceImpl.java

@@ -106,4 +106,10 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 	public int findCount(Map<String, Object> params) {
 		return this.getDAO().queryCount(params);
 	}
+
+	@Override
+	public <K extends List> Map getMap(String columnKey, String columnValue, K ids){
+		List<Map> idColumnMaps = this.getDAO().getMaps(columnKey, columnValue, ids);
+		return MapUtil.convertIntegerMap(idColumnMaps);
+	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRegistrationController.java

@@ -0,0 +1,36 @@
+package com.keao.edu.user.controller;
+
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.user.entity.ExamRegistration;
+import com.keao.edu.user.page.ExamRegistrationQueryInfo;
+import com.keao.edu.user.service.ExamRegistrationService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.23
+ */
+@RestController
+@Api(tags = "学员报名服务")
+@RequestMapping(value = "examRegistration")
+public class ExamRegistrationController extends BaseController {
+
+    @Autowired
+    private ExamRegistrationService examRegistrationService;
+
+    @ApiOperation(value = "学员报名记录查询")
+    @GetMapping(value = "list")
+    @PreAuthorize("@pcs.hasPermissions('agency/list')")
+    public HttpResponseResult<PageInfo<ExamRegistration>> configList(ExamRegistrationQueryInfo queryInfo) {
+        return succeed(examRegistrationService.queryPage(queryInfo));
+    }
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -2,22 +2,54 @@ package com.keao.edu.user.service.impl;
 
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.dao.ExamRegistrationDao;
 import com.keao.edu.user.entity.ExamRegistration;
+import com.keao.edu.user.service.AgencyService;
 import com.keao.edu.user.service.ExamRegistrationService;
+import com.keao.edu.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegistration> implements ExamRegistrationService {
 	
 	@Autowired
 	private ExamRegistrationDao examRegistrationDao;
+	@Autowired
+	private AgencyService agencyService;
 
 	@Override
 	public BaseDAO<Long, ExamRegistration> getDAO() {
 		return examRegistrationDao;
 	}
-	
+
+	@Override
+	public PageInfo<ExamRegistration> queryPage(QueryInfo queryInfo) {
+		PageInfo<ExamRegistration> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<ExamRegistration> dataList = new ArrayList<>();
+		int count = this.findCount(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = this.getDAO().queryPage(params);
+		}
+		pageInfo.setRows(dataList);
+
+		List<Integer> agencyIds=new ArrayList<>();
+		agencyIds.add(3);
+		Map map = agencyService.getMap("id_", "name_", agencyIds);
+
+		return pageInfo;
+	}
 }

edu-user/edu-user-server/src/main/resources/config/mybatis/AgencyMapper.xml

@@ -28,6 +28,19 @@
 	<select id="findAll" resultMap="Agency">
 		SELECT * FROM agency WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
+
+	<select id="getMaps" resultType="map">
+		<![CDATA[
+			SELECT
+				${columnKey} AS 'key',
+				${columnValue} AS 'value'
+			FROM agency
+			WHERE ${columnKey} IN
+		]]>
+			<foreach collection="ids" item="id" separator="," open="(" close=")">
+				#{id}
+			</foreach>
+	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Agency" useGeneratedKeys="true" keyColumn="id" keyProperty="id">

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -10,10 +10,8 @@
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
 		<result column="student_id_" property="studentId" />
-		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 		<result column="agency_id_" property="agencyId" />
 		<result column="subject_id_" property="subjectId" />
-		<association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
 		<result column="level_" property="level" />
 		<result column="song_json_" property="songJson" />
 		<result column="last_exam_level_" property="lastExamLevel" />
@@ -25,6 +23,8 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
+		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
+		<association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->

edu-util/src/main/java/com/keao/edu/util/collection/MapUtil.java

@@ -1,6 +1,7 @@
 package com.keao.edu.util.collection;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -133,7 +134,7 @@ public class MapUtil {
 	 * @return java.util.Map
 	 * @describe mybatis返回结果转换为Map
 	 */
-	public static <T,K> Map convertIntegerMap(List<Map<T,K>> maps){
+	public static Map convertIntegerMap(List<Map> maps){
 		int size = 0;
 		if(maps != null){
 			size = maps.size();