update

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

@@ -81,5 +81,16 @@ public interface BaseService<PK extends Serializable, T> {
 	 * @return java.util.List<java.util.Map>
 	 */
 	<K extends List, Y, Z> Map<Y,Z> getMap(String tableName, String columnKey, String columnValue, K ids, Class<Y> keyType, Class<Z> valueType);
+
+	/**
+	 * @describe 获取columnKey-columnValue集合
+	 * @author Joburgess
+	 * @date 2020.06.23
+	 * @param columnKey: key所对应的列名
+	 * @param columnValue: value所对应的列名
+	 * @param ids: key条件
+	 * @return java.util.List<java.util.Map>
+	 */
+	<K extends List> Map<String, String> getMap(String tableName, String columnKey, String columnValue, K ids);
 	
 }

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

@@ -20,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -126,8 +127,8 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 			PreparedStatement ps = sqlSessionFactory.openSession().getConnection().prepareStatement(sql.toString());
 			ResultSet resultSet = ps.executeQuery();
 			while (resultSet.next()){
-				Y key=null;
-				Z value=null;
+				Y key;
+				Z value;
 				if(keyType.isAssignableFrom(BigDecimal.class)){
 					key = (Y) BigDecimal.class.getDeclaredConstructor(String.class).newInstance(resultSet.getString(1));
 				}else if(keyType.isAssignableFrom(String.class)){
@@ -150,4 +151,22 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 
 		return result;
 	}
+
+	@Override
+	public <K extends List> Map<String, String> getMap(String tableName, String columnKey, String columnValue, K ids) {
+		StringBuffer sql=new StringBuffer();
+		Map<String, String> result=new HashMap();
+		try {
+			sql.append("select ").append(columnKey).append(",").append(columnValue).append(" FROM ").append(tableName).append(" WHERE ").append(columnKey).append(" IN (").append(StringUtils.join(ids, ",")).append(")");
+			PreparedStatement ps = sqlSessionFactory.openSession().getConnection().prepareStatement(sql.toString());
+			ResultSet resultSet = ps.executeQuery();
+			while (resultSet.next()){
+				result.put(resultSet.getString(1), resultSet.getString(2));
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return result;
+	}
 }

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

@@ -3,6 +3,7 @@ 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.Agency;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
 import com.keao.edu.user.service.ExamRegistrationService;
@@ -10,9 +11,7 @@ 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;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author Joburgess
@@ -28,9 +27,17 @@ public class ExamRegistrationController extends BaseController {
 
     @ApiOperation(value = "学员报名记录查询")
     @GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('agency/list')")
-    public HttpResponseResult<PageInfo<ExamRegistration>> configList(ExamRegistrationQueryInfo queryInfo) {
+    @PreAuthorize("@pcs.hasPermissions('examRegistration/list')")
+    public HttpResponseResult<PageInfo<ExamRegistration>> list(ExamRegistrationQueryInfo queryInfo) {
         return succeed(examRegistrationService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "修改学员报名信息")
+    @PostMapping(value = "update")
+    @PreAuthorize("@pcs.hasPermissions('examRegistration/update')")
+    public HttpResponseResult updateAgency(@RequestBody ExamRegistration examRegistration) {
+        examRegistrationService.update(examRegistration);
+        return succeed();
+    }
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -23,6 +23,9 @@ public class ExamRegistration {
 
 	@ApiModelProperty(value = "代理商编号")
 	private Integer agencyId;
+
+	@ApiModelProperty(value = "代理商信息")
+	private Agency agency;
 	
 	@ApiModelProperty(value = "专业编号")
 	private Integer subjectId;
@@ -68,6 +71,14 @@ public class ExamRegistration {
 		return this.id;
 	}
 
+	public Agency getAgency() {
+		return agency;
+	}
+
+	public void setAgency(Agency agency) {
+		this.agency = agency;
+	}
+
 	public StudentRegistrationStatusEnum getStatus() {
 		return status;
 	}

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

@@ -7,13 +7,11 @@ 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.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -22,8 +20,6 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 	
 	@Autowired
 	private ExamRegistrationDao examRegistrationDao;
-	@Autowired
-	private AgencyService agencyService;
 
 	@Override
 	public BaseDAO<Long, ExamRegistration> getDAO() {
@@ -43,9 +39,12 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 			params.put("offset", pageInfo.getOffset());
 			dataList = this.getDAO().queryPage(params);
 			List<Integer> agencyIds = dataList.stream().map(ExamRegistration::getAgencyId).collect(Collectors.toList());
-			Map<BigDecimal, String> agencyIdNameMap = this.getMap("agency", "id_", "name_", agencyIds, BigDecimal.class, String.class);
+			Map<Integer, String> agencyIdNameMap = this.getMap("agency", "id_", "name_", agencyIds, Integer.class, String.class);
+			List<Integer> subjectIds = dataList.stream().map(ExamRegistration::getSubjectId).collect(Collectors.toList());
+			Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
 			for (ExamRegistration examRegistration : dataList) {
-				examRegistration.setSongJson(agencyIdNameMap.get(examRegistration.getAgencyId()));
+				examRegistration.getAgency().setName(agencyIdNameMap.get(examRegistration.getAgencyId()));
+				examRegistration.getSubject().setName(subjectIdNameMap.get(examRegistration.getStudentId()));
 			}
 		}
 		pageInfo.setRows(dataList);

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

@@ -124,7 +124,7 @@
 			er.id_,
 			er.card_no_,
 			er.student_id_,
-			su.real_name_,
+			su.real_name_ sys_user_real_name_,
 			er.agency_id_,
 			er.subject_id_,
 			er.level_,