update

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

@@ -1,10 +1,9 @@
 package com.keao.edu.user.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 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.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.page.ExaminationQueryInfo;
 import com.keao.edu.user.service.ExaminationBasicService;
@@ -25,10 +24,16 @@ public class ExaminationBasicController extends BaseController {
     @Autowired
     private ExaminationBasicService examinationBasicService;
 
+    @ApiOperation("查询指定考级项目")
+    @GetMapping(value = "/getExaminationBasic")
+    public HttpResponseResult<ExaminationBasicDto> getExaminationBasic(Integer examId) {
+        return succeed(examinationBasicService.getExaminationBasic(examId));
+    }
+
     @ApiOperation("分页查询")
     @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExaminationBasic>> getList(ExaminationQueryInfo queryInfo) {
-        return succeed(examinationBasicService.queryPage(queryInfo));
+    public HttpResponseResult<PageInfo<ExaminationBasicDto>> getList(ExaminationQueryInfo queryInfo) {
+        return succeed(examinationBasicService.findExaminationBasics(queryInfo));
     }
 
     @ApiOperation("创建考级项目")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamMusicTheoryDao.java

@@ -0,0 +1,9 @@
+package com.keao.edu.user.dao;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.entity.ExamMusicTheory;
+
+public interface ExamMusicTheoryDao extends BaseDAO<Integer, ExamMusicTheory> {
+
+	
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamOrganizationRelationDao.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.dto.ExamOrganRegistDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import org.apache.ibatis.annotations.Param;
@@ -41,6 +42,8 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
      */
     List<ExamOrganizationRelation> getWithExam(@Param("examId") Integer examId);
 
+    List<ExamOrganizationRelation> getWithExams(@Param("examIds") List<Integer> examIds);
+
     /**
      * @describe 获取考级项目关联的合作单位编号
      * @author Joburgess
@@ -49,5 +52,6 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
      * @return java.util.Set<java.lang.Integer>
      */
     Set<Integer> getOrganIdsWithExam(@Param("examId") Integer examId);
+
 	
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExaminationBasicDao.java

@@ -1,15 +1,22 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.ExaminationBasic;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
 
     int batchUpdate(@Param("exams") List<ExaminationBasic> exams);
 
+    ExaminationBasicDto getExaminationBasic(Integer examId);
+
+    List<ExaminationBasicDto> findExaminationBasics(Map<String, Object> params);
+    int countExaminationBasics(Map<String, Object> params);
+
     /**
      * @describe 获取需要更新状态的考级项目
      * @author Joburgess

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/MusicTheoryDao.java

@@ -0,0 +1,9 @@
+package com.keao.edu.user.dao;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.entity.MusicTheory;
+
+public interface MusicTheoryDao extends BaseDAO<Integer, MusicTheory> {
+
+	
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamOrganRegistDto.java

@@ -0,0 +1,44 @@
+package com.keao.edu.user.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.27
+ */
+public class ExamOrganRegistDto {
+
+    private Integer examId;
+
+    @ApiModelProperty(value = "总报名人数")
+    private Integer totalRegistrationStudentNum;
+
+    @ApiModelProperty(value = "总缴费金额")
+    private BigDecimal totalPaymentAmount;
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+    public Integer getTotalRegistrationStudentNum() {
+        return totalRegistrationStudentNum;
+    }
+
+    public void setTotalRegistrationStudentNum(Integer totalRegistrationStudentNum) {
+        this.totalRegistrationStudentNum = totalRegistrationStudentNum;
+    }
+
+    public BigDecimal getTotalPaymentAmount() {
+        return totalPaymentAmount;
+    }
+
+    public void setTotalPaymentAmount(BigDecimal totalPaymentAmount) {
+        this.totalPaymentAmount = totalPaymentAmount;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExaminationBasicDto.java

@@ -0,0 +1,35 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.entity.ExaminationBasic;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.27
+ */
+public class ExaminationBasicDto extends ExaminationBasic {
+
+    @ApiModelProperty(value = "总报名人数")
+    private Integer totalRegistrationStudentNum;
+
+    @ApiModelProperty(value = "总缴费金额")
+    private BigDecimal totalPaymentAmount;
+
+    public Integer getTotalRegistrationStudentNum() {
+        return totalRegistrationStudentNum;
+    }
+
+    public void setTotalRegistrationStudentNum(Integer totalRegistrationStudentNum) {
+        this.totalRegistrationStudentNum = totalRegistrationStudentNum;
+    }
+
+    public BigDecimal getTotalPaymentAmount() {
+        return totalPaymentAmount;
+    }
+
+    public void setTotalPaymentAmount(BigDecimal totalPaymentAmount) {
+        this.totalPaymentAmount = totalPaymentAmount;
+    }
+}

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

@@ -0,0 +1,92 @@
+package com.keao.edu.user.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(exam_music_theory):
+ */
+public class ExamMusicTheory {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer examinationBasicId;
+	
+	/** 等级 */
+	private Integer level;
+	
+	/** 费用 */
+	private java.math.BigDecimal fee;
+	
+	/**  */
+	private Integer tenantId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setExaminationBasicId(Integer examinationBasicId){
+		this.examinationBasicId = examinationBasicId;
+	}
+	
+	public Integer getExaminationBasicId(){
+		return this.examinationBasicId;
+	}
+			
+	public void setLevel(Integer level){
+		this.level = level;
+	}
+	
+	public Integer getLevel(){
+		return this.level;
+	}
+			
+	public void setFee(java.math.BigDecimal fee){
+		this.fee = fee;
+	}
+	
+	public java.math.BigDecimal getFee(){
+		return this.fee;
+	}
+			
+	public void setTenantId(Integer tenantId){
+		this.tenantId = tenantId;
+	}
+	
+	public Integer getTenantId(){
+		return this.tenantId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,81 @@
+package com.keao.edu.user.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_theory):
+ */
+public class MusicTheory {
+
+	/**  */
+	private Integer id;
+	
+	/** 等级 */
+	private Integer level;
+	
+	/** 费用 */
+	private java.math.BigDecimal fee;
+	
+	/**  */
+	private Integer tenantId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setLevel(Integer level){
+		this.level = level;
+	}
+	
+	public Integer getLevel(){
+		return this.level;
+	}
+			
+	public void setFee(java.math.BigDecimal fee){
+		this.fee = fee;
+	}
+	
+	public java.math.BigDecimal getFee(){
+		return this.fee;
+	}
+			
+	public void setTenantId(Integer tenantId){
+		this.tenantId = tenantId;
+	}
+	
+	public Integer getTenantId(){
+		return this.tenantId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -28,6 +28,9 @@ public class Organization {
 
 	@ApiModelProperty(value = "分润金额",required = false)
 	private java.math.BigDecimal shareProfitAmount;
+
+	@ApiModelProperty(value = "是否允许排考")
+	private Integer isAllowArrangeExam;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -42,6 +45,14 @@ public class Organization {
 
 	private SysUser sysUser;
 
+	public Integer getIsAllowArrangeExam() {
+		return isAllowArrangeExam;
+	}
+
+	public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
+		this.isAllowArrangeExam = isAllowArrangeExam;
+	}
+
 	public SysUser getSysUser() {
 		return sysUser;
 	}

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

@@ -0,0 +1,8 @@
+package com.keao.edu.user.service;
+
+import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.entity.ExamMusicTheory;
+
+public interface ExamMusicTheoryService extends BaseService<Integer, ExamMusicTheory> {
+
+}

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

@@ -1,7 +1,10 @@
 package com.keao.edu.user.service;
 
+import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.ExaminationBasic;
+import com.keao.edu.user.page.ExaminationQueryInfo;
 
 public interface ExaminationBasicService extends BaseService<Long, ExaminationBasic> {
 
@@ -23,6 +26,24 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
     void updateExamStatus();
 
     /**
+     * @describe 获取考级项目
+     * @author Joburgess
+     * @date 2020.06.27
+     * @param queryInfo:
+     * @return com.keao.edu.common.page.PageInfo<com.keao.edu.user.dto.ExaminationBasicDto>
+     */
+    PageInfo<ExaminationBasicDto> findExaminationBasics(ExaminationQueryInfo queryInfo);
+
+    /**
+     * @describe 获取指定的考级项目
+     * @author Joburgess
+     * @date 2020.06.27
+     * @param examId:
+     * @return com.keao.edu.user.dto.ExaminationBasicDto
+     */
+    ExaminationBasicDto getExaminationBasic(Integer examId);
+
+    /**
      * @describe 关闭考级项目
      * @author Joburgess
      * @date 2020.06.19

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

@@ -0,0 +1,8 @@
+package com.keao.edu.user.service;
+
+import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.entity.MusicTheory;
+
+public interface MusicTheoryService extends BaseService<Integer, MusicTheory> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.keao.edu.user.service.impl;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.user.dao.ExamMusicTheoryDao;
+import com.keao.edu.user.entity.ExamMusicTheory;
+import com.keao.edu.user.service.ExamMusicTheoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ExamMusicTheoryServiceImpl extends BaseServiceImpl<Integer, ExamMusicTheory> implements ExamMusicTheoryService {
+	
+	@Autowired
+	private ExamMusicTheoryDao examMusicTheoryDao;
+
+	@Override
+	public BaseDAO<Integer, ExamMusicTheory> getDAO() {
+		return examMusicTheoryDao;
+	}
+	
+}

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

@@ -2,25 +2,36 @@ package com.keao.edu.user.service.impl;
 
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
+import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.common.tenant.TenantContextHolder;
+import com.keao.edu.user.dao.ExamOrganizationRelationDao;
 import com.keao.edu.user.dao.ExaminationBasicDao;
+import com.keao.edu.user.dto.ExaminationBasicDto;
+import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.enums.ExamModeEnum;
 import com.keao.edu.user.enums.ExamStatusEnum;
+import com.keao.edu.user.page.ExaminationQueryInfo;
 import com.keao.edu.user.service.ExaminationBasicService;
+import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, ExaminationBasic> implements ExaminationBasicService{
 
 	@Autowired
 	private ExaminationBasicDao examinationBasicDao;
+	@Autowired
+	private ExamOrganizationRelationDao examOrganizationRelationDao;
 
 	@Override
 	public BaseDAO<Long, ExaminationBasic> getDAO() {
@@ -69,6 +80,58 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 	}
 
 	@Override
+	public PageInfo<ExaminationBasicDto> findExaminationBasics(ExaminationQueryInfo queryInfo) {
+		PageInfo<ExaminationBasicDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<ExaminationBasicDto> dataList = new ArrayList<>();
+		int count = examinationBasicDao.countExaminationBasics(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = examinationBasicDao.findExaminationBasics(params);
+			List<Integer> examIds = dataList.stream().map(ExaminationBasicDto::getId).collect(Collectors.toList());
+			List<ExamOrganizationRelation> examOrgans = examOrganizationRelationDao.getWithExams(examIds);
+			Map<Integer, List<ExamOrganizationRelation>> examOrgansMap = new HashMap<>();
+			if(!CollectionUtils.isEmpty(examOrgans)){
+				examOrgansMap = examOrgans.stream().collect(Collectors.groupingBy(ExamOrganizationRelation::getExaminationBasicId));
+			}
+			for (ExaminationBasicDto examinationBasicDto : dataList) {
+				List<ExamOrganizationRelation> examOrganizationRelations = examOrgansMap.get(examinationBasicDto.getId());
+				if(CollectionUtils.isEmpty(examOrganizationRelations)){
+					continue;
+				}
+				long totalRegistrationStudentNum = examOrganizationRelations.stream().map(ExamOrganizationRelation::getTotalRegistrationStudentNum).count();
+				long totalPaymentAmount = examOrganizationRelations.stream().map(ExamOrganizationRelation::getTotalPaymentAmount).count();
+				examinationBasicDto.setTotalRegistrationStudentNum((int) totalRegistrationStudentNum);
+				examinationBasicDto.setTotalPaymentAmount(new BigDecimal(totalPaymentAmount));
+			}
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
+	@Override
+	public ExaminationBasicDto getExaminationBasic(Integer examId) {
+		if(Objects.isNull(examId)){
+			throw new BizException("请指定考级项目");
+		}
+		ExaminationBasicDto examinationBasic = examinationBasicDao.getExaminationBasic(examId);
+		if(Objects.isNull(examinationBasic)){
+			throw new BizException("指定的考级项目不存在");
+		}
+		List<ExamOrganizationRelation> examOrganizationRelations = examOrganizationRelationDao.getWithExam(examId);
+		if(!CollectionUtils.isEmpty(examOrganizationRelations)){
+			long totalRegistrationStudentNum = examOrganizationRelations.stream().map(ExamOrganizationRelation::getTotalRegistrationStudentNum).count();
+			long totalPaymentAmount = examOrganizationRelations.stream().map(ExamOrganizationRelation::getTotalPaymentAmount).count();
+			examinationBasic.setTotalRegistrationStudentNum((int) totalRegistrationStudentNum);
+			examinationBasic.setTotalPaymentAmount(new BigDecimal(totalPaymentAmount));
+		}
+		return examinationBasic;
+	}
+
+	@Override
 	public void closeExam(Integer examId, String reason) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");

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

@@ -0,0 +1,22 @@
+package com.keao.edu.user.service.impl;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.user.dao.MusicTheoryDao;
+import com.keao.edu.user.entity.MusicTheory;
+import com.keao.edu.user.service.MusicTheoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MusicTheoryServiceImpl extends BaseServiceImpl<Integer, MusicTheory> implements MusicTheoryService {
+	
+	@Autowired
+	private MusicTheoryDao musicTheoryDao;
+
+	@Override
+	public BaseDAO<Integer, MusicTheory> getDAO() {
+		return musicTheoryDao;
+	}
+	
+}

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.keao.edu.datasource.dal.dao.ExamMusicTheoryDao">
+	
+	<resultMap type="com.keao.edu.datasource.dal.entity.ExamMusicTheory" id="ExamMusicTheory">
+		<result column="id_" property="id" />
+		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="level_" property="level" />
+		<result column="fee_" property="fee" />
+		<result column="tenant_id_" property="tenantId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="ExamMusicTheory" >
+		SELECT * FROM exam_music_theory WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="ExamMusicTheory">
+		SELECT * FROM exam_music_theory ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.datasource.dal.entity.ExamMusicTheory" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO exam_music_theory (id_,examination_basic_id_,level_,fee_,tenant_id_,create_time_,update_time_) VALUES(#{id},#{examinationBasicId},#{level},#{fee},#{tenantId},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.datasource.dal.entity.ExamMusicTheory">
+		UPDATE exam_music_theory <set>
+<if test="examinationBasicId != null">
+examination_basic_id_ = #{examinationBasicId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="fee != null">
+fee_ = #{fee},
+</if>
+<if test="tenantId != null">
+tenant_id_ = #{tenantId},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="level != null">
+level_ = #{level},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM exam_music_theory WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="ExamMusicTheory" parameterType="map">
+		SELECT * FROM exam_music_theory ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM exam_music_theory
+	</select>
+</mapper>

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

@@ -146,4 +146,10 @@
 	<select id="getOrganIdsWithExam" resultType="int">
 		SELECT organ_id_ FROM exam_organization_relation WHERE examination_basic_id_=#{examId} FOR UPDATE
 	</select>
+    <select id="getWithExams" resultMap="ExamOrganizationRelation">
+		SELECT * FROM exam_organization_relation WHERE examination_basic_id_ IN
+		<foreach collection="examIds" item="examId" separator="," open="(" close=")">
+			#{examId}
+		</foreach>
+    </select>
 </mapper>

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

@@ -25,11 +25,18 @@
 		<result column="memo_" property="memo" />
 	</resultMap>
 
+	<resultMap id="ExaminationBasicDto" type="com.keao.edu.user.dto.ExaminationBasicDto" extends="ExaminationBasic">
+	</resultMap>
+
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ExaminationBasic" >
 		SELECT * FROM examination_basic WHERE id_ = #{id}
 	</select>
 
+	<select id="getExaminationBasic" resultMap="ExaminationBasic" >
+		SELECT * FROM examination_basic WHERE id_ = #{examId}
+	</select>
+
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ExaminationBasic">
 		SELECT * FROM examination_basic WHERE tenant_id_=#{tenantId}
@@ -162,6 +169,17 @@
 		<include refid="queryCondition"/>
 	</select>
 
+	<select id="findExaminationBasics" resultMap="ExaminationBasicDto" parameterType="map">
+		SELECT * FROM examination_basic
+		<include refid="queryCondition"/>
+		<include refid="global.limit"/>
+	</select>
+
+	<select id="countExaminationBasics" resultType="int">
+		SELECT COUNT(*) FROM examination_basic
+		<include refid="queryCondition"/>
+	</select>
+
     <select id="getNeedUpdateStatusExams" resultMap="ExaminationBasic">
 		SELECT * FROM examination_basic WHERE status_ IN ('NOT_START', 'APPLYING', 'APPLIED')
 	</select>

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

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.keao.edu.user.dao.MusicTheoryDao">
+	
+	<resultMap type="com.keao.edu.user.entity.MusicTheory" id="MusicTheory">
+		<result column="id_" property="id" />
+		<result column="level_" property="level" />
+		<result column="fee_" property="fee" />
+		<result column="tenant_id_" property="tenantId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicTheory" >
+		SELECT * FROM music_theory WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicTheory">
+		SELECT * FROM music_theory ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.user.entity.MusicTheory" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO music_theory (id_,level_,fee_,tenant_id_,create_time_,update_time_)
+		VALUES(#{id},#{level},#{fee},#{tenantId},NOW(),NOW())
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.user.entity.MusicTheory">
+		UPDATE music_theory
+		<set>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="fee != null">
+				fee_ = #{fee},
+			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
+			</if>
+			<if test="level != null">
+				level_ = #{level},
+			</if>
+				update_time_ = NOW()
+		</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_theory WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicTheory" parameterType="map">
+		SELECT * FROM music_theory ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_theory
+	</select>
+</mapper>

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

@@ -13,6 +13,7 @@
 		<result column="contact_phone_" property="contactPhone" />
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="share_profit_amount_" property="shareProfitAmount" />
+		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -31,9 +32,9 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Organization" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO organization (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount_,create_time_,update_time_,tenant_id_)
+		INSERT INTO organization (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		#{shareProfitAmount},NOW(),NOW(),#{tenantId})
+		#{shareProfitAmount},#{isAllowArrangeExam},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -57,6 +58,9 @@
 		<if test="name != null">
 		name_ = #{name},
 		</if>
+		<if test="isAllowArrangeExam != null">
+			is_allow_arrange_exam_ = #{isAllowArrangeExam},
+		</if>
 		<if test="tenantId != null">
 			tenant_id_ = #{tenantId},
 		</if>