Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -1,7 +1,5 @@
 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;
@@ -46,7 +44,7 @@ public class ExamSubjectSongController extends BaseController {
 
     @ApiOperation("更新考试内容")
     @PostMapping(value = "/update")
-    public HttpResponseResult update(ExamSubjectSong examSubjectSong) {
+    public HttpResponseResult update(@RequestBody ExamSubjectSong examSubjectSong) {
         examSubjectSongService.update(examSubjectSong);
         return succeed();
     }

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

@@ -32,9 +32,15 @@ public class ExamOrganizationRelation {
 	@ApiModelProperty(value = "总报名人数")
 	private Integer totalRegistrationStudentNum;
 
+	@ApiModelProperty(value = "本单位报名学生数")
+	private Integer selfRegistrationStudentNum;
+
 	@ApiModelProperty(value = "总缴费金额")
 	private BigDecimal totalPaymentAmount;
 
+	@ApiModelProperty(value = "本单位缴费金额")
+	private BigDecimal selfPaymentAmount;
+
 	@ApiModelProperty(value = "总交易金额")
 	private BigDecimal totalTransAmount;
 
@@ -77,6 +83,22 @@ public class ExamOrganizationRelation {
 		return this.examinationBasicId;
 	}
 
+	public Integer getSelfRegistrationStudentNum() {
+		return selfRegistrationStudentNum;
+	}
+
+	public void setSelfRegistrationStudentNum(Integer selfRegistrationStudentNum) {
+		this.selfRegistrationStudentNum = selfRegistrationStudentNum;
+	}
+
+	public BigDecimal getSelfPaymentAmount() {
+		return selfPaymentAmount;
+	}
+
+	public void setSelfPaymentAmount(BigDecimal selfPaymentAmount) {
+		this.selfPaymentAmount = selfPaymentAmount;
+	}
+
 	public Integer getTotalRegistrationStudentNum() {
 		return totalRegistrationStudentNum;
 	}

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

@@ -91,6 +91,8 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         examinationBasic.setStatus(ExamStatusEnum.SETTING);
         examinationBasicDao.insert(examinationBasic);
 
+        examOrganizationRelationService.addExamOrganizations(examinationBasic.getId(),examinationBasic.getOrganId().toString());
+
         List<ExamMusicTheory> examMusicTheories = new ArrayList<>();
         for (MusicTheory musicTheory : musicTheories) {
             ExamMusicTheory emt = new ExamMusicTheory();
@@ -139,9 +141,6 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         if(ExamStatusEnum.RESULT_CONFIRM.equals(existsExam.getStatus())){
             throw new BizException("考级项目结果已确认");
         }
-        if(ExamStatusEnum.SETTING.equals(existsExam.getStatus())&&ExamStatusEnum.NOT_START.equals(statusEnum)){
-            examOrganizationRelationService.addExamOrganizations(existsExam.getId(),existsExam.getOrganId().toString());
-        }
         existsExam.setStatus(statusEnum);
         examinationBasicDao.update(existsExam);
     }
@@ -240,7 +239,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 
         List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
 
-        if(!childOrganIds.contains(examinationBasic.getOrganId())){
+        if(Objects.nonNull(childOrganIds)&&!childOrganIds.contains(examinationBasic.getOrganId())){
             throw new BizException("删除失败");
         }
 

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

@@ -12,6 +12,8 @@
 		<result column="organ_id_" property="organId" />
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
 		<result column="share_profit_amount_" property="shareProfitAmount" />
+		<result column="self_registration_student_num_" property="selfRegistrationStudentNum" />
+		<result column="self_payment_amount_" property="selfPaymentAmount" />
 		<result column="total_registration_student_num_" property="totalRegistrationStudentNum"/>
 		<result column="total_payment_amount_" property="totalPaymentAmount"/>
 		<result column="total_trans_amount_" property="totalTransAmount" />
@@ -39,24 +41,30 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,
-		total_payment_amount_,url_,send_url_flag_,is_allow_arrange_exam_,total_trans_amount_,
+		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,
+		self_registration_student_num_,self_payment_amount_,total_registration_student_num_,total_payment_amount_,
+		url_,send_url_flag_,is_allow_arrange_exam_,total_trans_amount_,
 		create_time_,update_time_,tenant_id_)
 		VALUES(#{examinationBasicId},#{organId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},
-		#{totalRegistrationStudentNum},#{totalPaymentAmount},#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+		#{selfRegistrationStudentNum},#{selfPaymentAmount},#{totalRegistrationStudentNum},#{totalPaymentAmount},
+		#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 		#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},totalTransAmount,
 		NOW(),NOW(),#{tenantId})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,
-		total_payment_amount_,url_,send_url_flag_,is_allow_arrange_exam_,total_trans_amount_,
+		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,
+		self_registration_student_num_,self_payment_amount_,total_registration_student_num_,total_payment_amount_,
+		url_,send_url_flag_,is_allow_arrange_exam_,total_trans_amount_,
 		create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="examOrganizationRelations" item="examOrganizationRelation" separator=",">
 			(#{examOrganizationRelation.examinationBasicId},#{examOrganizationRelation.organId},
 			#{examOrganizationRelation.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-			#{examOrganizationRelation.shareProfitAmount},#{examOrganizationRelation.totalRegistrationStudentNum},
+			#{examOrganizationRelation.shareProfitAmount},
+			#{examOrganizationRelation.selfRegistrationStudentNum},
+			#{examOrganizationRelation.selfPaymentAmount},
+			#{examOrganizationRelation.totalRegistrationStudentNum},
 			#{examOrganizationRelation.totalPaymentAmount},#{examOrganizationRelation.url},
 			#{examOrganizationRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			#{examOrganizationRelation.isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
@@ -87,6 +95,12 @@
 			<if test="shareProfitAmount != null">
 				share_profit_amount_ = #{shareProfitAmount},
 			</if>
+			<if test="selfRegistrationStudentNum != null">
+				self_registration_student_num_ = #{selfRegistrationStudentNum},
+			</if>
+			<if test="selfPaymentAmount != null">
+				self_payment_amount_ = #{selfPaymentAmount},
+			</if>
 			<if test="totalRegistrationStudentNum != null">
 				total_registration_student_num_ = #{totalRegistrationStudentNum},
 			</if>
@@ -128,6 +142,12 @@
 				<if test="eo.shareProfitAmount != null">
 					share_profit_amount_ = #{eo.shareProfitAmount},
 				</if>
+				<if test="eo.selfRegistrationStudentNum != null">
+					self_registration_student_num_ = #{eo.selfRegistrationStudentNum},
+				</if>
+				<if test="eo.selfPaymentAmount != null">
+					self_payment_amount_ = #{eo.selfPaymentAmount},
+				</if>
 				<if test="eo.totalRegistrationStudentNum != null">
 					total_registration_student_num_ = #{eo.totalRegistrationStudentNum},
 				</if>

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

@@ -114,7 +114,7 @@
 				AND er.exam_registration_id_=#{registId}
 			</if>
 			<if test="examinationBaseId!=null">
-				AND ere.examination_basic_id_ = #{examinationBaseId}
+				AND er.examination_basic_id_ = #{examinationBaseId}
 			</if>
 			<if test="cardNo!=null">
 				AND ere.card_no_=#{cardNo}

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

@@ -211,16 +211,33 @@
 		<include refid="queryCondition"/>
 	</select>
 
+	<sql id="indExaminationBasicsCondition">
+		<where>
+			<if test="organIds!=null">
+				AND organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
+			<if test="examStatus!=null">
+				AND status_=#{examStatus}
+			</if>
+			<if test="search!=null">
+				AND (id_=#{search} OR name_ LIKE CONCAT(#{search}, '%'))
+			</if>
+		</where>
+	</sql>
+
 	<select id="findExaminationBasics" resultMap="ExaminationBasicDto" parameterType="map">
 		SELECT * FROM examination_basic
-		<include refid="queryCondition"/>
+		<include refid="indExaminationBasicsCondition"/>
 		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>
 
 	<select id="countExaminationBasics" resultType="int">
 		SELECT COUNT(*) FROM examination_basic
-		<include refid="queryCondition"/>
+		<include refid="indExaminationBasicsCondition"/>
 	</select>
 
     <select id="getNeedUpdateStatusExams" resultMap="ExaminationBasic">