Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDefaultMusicGroupSalaryDao.java

@@ -20,11 +20,10 @@ public interface TeacherDefaultMusicGroupSalaryDao extends BaseDAO<Long, Teacher
     List<TeacherDefaultMusicGroupSalary> getTeacherSalaryByUserIdAndType(@Param("userId") int userId, @Param("classGroupType") String classGroupType, @Param("settlementType") SalarySettlementTypeEnum settlementType);
 
     /**
-     * 根据教师编号和结算类型删除
+     * 根据教师编号删除
      * @param userId
-     * @param settlementType
      */
-    void delByTeacherId(@Param("userId")Integer userId, @Param("settlementType") String settlementType);
+    void delByTeacherId(@Param("userId")Integer userId);
 
     /**
      * 批量新增

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherDefaultMusicGroupSalary.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -26,25 +25,21 @@ public class TeacherDefaultMusicGroupSalary {
 	@ApiModelProperty(value = "课程类型",required = false)
 	private CourseSchedule.CourseScheduleType courseScheduleType;
 
-
-	@ApiModelProperty(value = "结算方式",required = false)
-	private SalarySettlementTypeEnum settlementType;
-
 	/**  */
-	@ApiModelProperty(value = "最小课时长度",required = false)
-	private Integer durationMin;
+	@ApiModelProperty(value = "主教90分钟课酬",required = false)
+	private BigDecimal mainTeacher90MinSalary;
 
 	/**  */
-	@ApiModelProperty(value = "最大课时长度",required = false)
-	private Integer durationMax;
+	@ApiModelProperty(value = "助教90分钟课酬",required = false)
+	private BigDecimal assistantTeacher90MinSalary;
 	
 	/** 主教薪酬 */
-	@ApiModelProperty(value = "主教薪酬",required = false)
-	private BigDecimal mainTeacherSalary;
+	@ApiModelProperty(value = "主教30分钟课酬",required = false)
+	private BigDecimal mainTeacher30MinSalary;
 	
 	/** 助教薪酬 */
-	@ApiModelProperty(value = "助教薪酬",required = false)
-	private BigDecimal assistantTeacherSalary;
+	@ApiModelProperty(value = "助教30分钟课酬",required = false)
+	private BigDecimal assistantTeacher30MinSalary;
 
 	@ApiModelProperty(value = "是否删除该条数据",required = false)
 	private YesOrNoEnum delFlag;
@@ -87,20 +82,20 @@ public class TeacherDefaultMusicGroupSalary {
 		this.courseScheduleType = courseScheduleType;
 	}
 
-	public BigDecimal getMainTeacherSalary() {
-		return mainTeacherSalary;
+	public BigDecimal getMainTeacher30MinSalary() {
+		return assistantTeacher30MinSalary;
 	}
 
-	public void setMainTeacherSalary(BigDecimal mainTeacherSalary) {
-		this.mainTeacherSalary = mainTeacherSalary;
+	public void setMainTeacher30MinSalary(BigDecimal assistantTeacher30MinSalary) {
+		this.assistantTeacher30MinSalary = assistantTeacher30MinSalary;
 	}
 
-	public BigDecimal getAssistantTeacherSalary() {
-		return assistantTeacherSalary;
+	public BigDecimal getAssistantTeacher30MinSalary() {
+		return assistantTeacher30MinSalary;
 	}
 
-	public void setAssistantTeacherSalary(BigDecimal assistantTeacherSalary) {
-		this.assistantTeacherSalary = assistantTeacherSalary;
+	public void setAssistantTeacher30MinSalary(BigDecimal assistantTeacher30MinSalary) {
+		this.assistantTeacher30MinSalary = assistantTeacher30MinSalary;
 	}
 
 	public void setCreateTime(java.util.Date createTime){
@@ -118,29 +113,23 @@ public class TeacherDefaultMusicGroupSalary {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-	public Integer getDurationMin() {
-		return durationMin;
-	}
-
-	public void setDurationMin(Integer durationMin) {
-		this.durationMin = durationMin;
+	
+	public BigDecimal getMainTeacher90MinSalary() {
+		return mainTeacher90MinSalary;
 	}
 
-	public Integer getDurationMax() {
-		return durationMax;
+	public void setMainTeacher90MinSalary(BigDecimal mainTeacher90MinSalary) {
+		this.mainTeacher90MinSalary = mainTeacher90MinSalary;
 	}
 
-	public void setDurationMax(Integer durationMax) {
-		this.durationMax = durationMax;
+	public BigDecimal getAssistantTeacher90MinSalary() {
+		return assistantTeacher90MinSalary;
 	}
 
-	public SalarySettlementTypeEnum getSettlementType() {
-		return settlementType;
+	public void setAssistantTeacher90MinSalary(BigDecimal assistantTeacher90MinSalary) {
+		this.assistantTeacher90MinSalary = assistantTeacher90MinSalary;
 	}
 
-	public void setSettlementType(SalarySettlementTypeEnum settlementType) {
-		this.settlementType = settlementType;
-	}
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -441,20 +441,20 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         List<Map<String, String>> configs = JSONArray.parseObject(sysConfig.getParanValue(), List.class);
                         for (Map<String, String> config : configs) {
                             TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
-                            teacherDefaultMusicGroupSalary.setDurationMin(Integer.parseInt(config.get("min")));
-                            teacherDefaultMusicGroupSalary.setDurationMax(Integer.parseInt(config.get("max")));
-                            teacherDefaultMusicGroupSalary.setSettlementType(type);
+                            //teacherDefaultMusicGroupSalary.setDurationMin(Integer.parseInt(config.get("min")));
+                            //teacherDefaultMusicGroupSalary.setDurationMax(Integer.parseInt(config.get("max")));
+                            //teacherDefaultMusicGroupSalary.setSettlementType(type);
                             teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
-                            teacherDefaultMusicGroupSalary.setAssistantTeacherSalary(zeroSalary);
-                            teacherDefaultMusicGroupSalary.setMainTeacherSalary(zeroSalary);
+                            teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
+                            teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
 
                             teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
                         }
                     } else {
                         TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
-                        teacherDefaultMusicGroupSalary.setAssistantTeacherSalary(zeroSalary);
-                        teacherDefaultMusicGroupSalary.setMainTeacherSalary(zeroSalary);
-                        teacherDefaultMusicGroupSalary.setSettlementType(type);
+                        teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
+                        teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
+                        //teacherDefaultMusicGroupSalary.setSettlementType(type);
                         teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
 
                         teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
@@ -946,7 +946,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     BigDecimal salary = new BigDecimal("0");
                     for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherSalaryList) {
                         //对应基准课酬
-                        BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacherSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacherSalary();
+                        BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                         //基准课酬
                         if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
                             salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -1147,7 +1147,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     BigDecimal salary = new BigDecimal("0");
                     for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherSalaryList) {
                         //对应基准课酬
-                        BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacherSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacherSalary();
+                        BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                         //基准课酬
                         if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
                             salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -1350,7 +1350,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     BigDecimal salary = new BigDecimal("0");
                     for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherSalaryList) {
                         //对应基准课酬
-                        BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacherSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacherSalary();
+                        BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                         //基准课酬
                         if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
                             salary = new BigDecimal(classCourseDuration).divide(new BigDecimal(30)).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupTeacherMapperServiceImpl.java

@@ -123,7 +123,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 List<TeacherDefaultMusicGroupSalary> teacherDefaultMusicGroupSalaryList = classGroupTeacherMapper.getTeacherDefaultMusicGroupSalaryList();
                 for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherDefaultMusicGroupSalaryList) {
                     //对应基准课酬
-                    BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacherSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacherSalary();
+                    BigDecimal baseSalary = classGroupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                     //基准课酬
                     if (teacherDefaultMusicGroupSalary.getSettlementType().equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
                         salary = new BigDecimal(duration).divide(new BigDecimal(30),8,BigDecimal.ROUND_HALF_UP).multiply(baseSalary).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -287,12 +287,12 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
             if (Objects.isNull(bishopTeacherDefaultMusicGroupSalary)) {
                 throw new BizException("存在未设置默认课酬的教师");
             }
-            BigDecimal bishopTeacherDefaultSalary = teachType == TeachTypeEnum.BISHOP ? bishopTeacherDefaultMusicGroupSalary.getMainTeacherSalary() : bishopTeacherDefaultMusicGroupSalary.getAssistantTeacherSalary();
+            BigDecimal bishopTeacherDefaultSalary = teachType == TeachTypeEnum.BISHOP ? bishopTeacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : bishopTeacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
             teacherSalary = bishopTeacherDefaultSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
         } else if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
             for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherDefaultMusicGroupSalariesWithTeacherId) {
                 if (duration >= teacherDefaultMusicGroupSalary.getDurationMin() && duration <= teacherDefaultMusicGroupSalary.getDurationMin()) {
-                    teacherSalary = teachType == TeachTypeEnum.BISHOP ? teacherDefaultMusicGroupSalary.getMainTeacherSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacherSalary();
+                    teacherSalary = teachType == TeachTypeEnum.BISHOP ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                     break;
                 }
             }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherDefaultMusicGroupSalaryServiceImpl.java

@@ -32,7 +32,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 		if(salaries != null && salaries.size() > 0){
 			//删除当前教师所有的结算类型的数据
 			TeacherDefaultMusicGroupSalary salary = salaries.get(0);
-			teacherDefaultMusicGroupSalaryDao.delByTeacherId(salary.getUserId(),salary.getSettlementType().getCode());
+			teacherDefaultMusicGroupSalaryDao.delByTeacherId(salary.getUserId());
 			//批量新增
 			teacherDefaultMusicGroupSalaryDao.batchAdd(salaries);
 			/*Date date = new Date();

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

@@ -7,11 +7,10 @@
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId"/>
 		<result column="course_schedule_type_" property="courseScheduleType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="settlement_type_" property="settlementType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="duration_min_" property="durationMin" />
-		<result column="duration_max_" property="durationMax" />
-		<result column="main_teacher_salary_" property="mainTeacherSalary" />
-		<result column="assistant_teacher_salary_" property="assistantTeacherSalary" />
+		<result column="main_teacher_90min_salary_" property="mainTeacher90MinSalary" />
+		<result column="assistant_teacher_90min_salary_" property="assistantTeacher90MinSalary" />
+		<result column="main_teacher_30min_salary_" property="mainTeacher30MinSalary" />
+		<result column="assistant_teacher_30min_salary_" property="assistantTeacher30MinSalary" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -32,20 +31,20 @@
 		parameterType="com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO teacher_default_music_group_salary
-		(user_id_,course_schedule_type_,settlement_type_,duration_min_,duration_max_,main_teacher_salary_,
-		assistant_teacher_salary_,create_time_,update_time_)
+		(user_id_,course_schedule_type_,main_teacher_90min_salary_,assistant_teacher_90min_salary_,main_teacher_30min_salary_,
+		assistant_teacher_30min_salary_,create_time_,update_time_)
 		VALUES(#{userId},#{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{settlementType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{durationMin},#{durationMax},
-		#{mainTeacherSalary},#{assistantTeacherSalary},now(),now())
+		#{mainTeacher90MinSalary},#{assistantTeacher90MinSalary},
+		#{mainTeacher30MinSalary},#{assistantTeacher30MinSalary},now(),now())
 	</insert>
 	<insert id="batchAdd" parameterType="list">
 		INSERT INTO teacher_default_music_group_salary
-		(user_id_,course_schedule_type_,settlement_type_,duration_min_,duration_max_,main_teacher_salary_,
-		assistant_teacher_salary_,create_time_,update_time_)
+		(user_id_,course_schedule_type_,main_teacher_90min_salary_,assistant_teacher_90min_salary_,main_teacher_30min_salary_,
+		assistant_teacher_30min_salary_,create_time_,update_time_)
 		VALUES
 		<foreach collection="salaries" item="item" separator=",">
-			(#{item.userId},#{item.courseScheduleType.code},#{item.settlementType.code},#{item.durationMin},
-			#{item.durationMax},#{item.mainTeacherSalary},#{item.assistantTeacherSalary},now(),now())
+			(#{item.userId},#{item.courseScheduleType.code},#{item.mainTeacher90MinSalary},
+			#{item.assistantTeacher90MinSalary},#{item.mainTeacher30MinSalary},#{item.assistantTeacher30MinSalary},now(),now())
 		</foreach>
 	</insert>
 
@@ -63,20 +62,17 @@
 			<if test="courseScheduleType != null">
 				course_schedule_type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
-			<if test="settlementType != null">
-				settlement_type_ = #{settlementType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			<if test="main_teacher_90min_salary_ != null">
+				main_teacher_90min_salary_ = #{mainTeacher90MinSalary},
 			</if>
-			<if test="duration_min_ != null">
-				duration_min_ = #{durationMin},
+			<if test="assistant_teacher_90min_salary_ != null">
+				assistant_teacher_90min_salary_ = #{assistantTeacher90MinSalary},
 			</if>
-			<if test="duration_max_ != null">
-				duration_max_ = #{durationMax},
+			<if test="mainTeacher30MinSalary != null">
+				main_teacher_30min_salary_ = #{mainTeacher30MinSalary},
 			</if>
-			<if test="mainTeacherSalary != null">
-				main_teacher_salary_ = #{mainTeacherSalary},
-			</if>
-			<if test="assistantTeacherSalary != null">
-				assistant_teacher_salary_ = #{assistantTeacherSalary},
+			<if test="assistantTeacher30MinSalary != null">
+				assistant_teacher_30min_salary_ = #{assistantTeacher30MinSalary},
 			</if>
 		</set>
 		WHERE id_ = #{id}
@@ -87,7 +83,7 @@
 		DELETE FROM teacher_default_music_group_salary WHERE id_ = #{id}
 	</delete>
     <delete id="delByTeacherId">
-		DELETE FROM teacher_default_music_group_salary WHERE user_id_ = #{userId} AND settlement_type_ = #{settlementType}
+		DELETE FROM teacher_default_music_group_salary WHERE user_id_ = #{userId}
 	</delete>
 
     <!-- 分页查询 -->
@@ -102,9 +98,6 @@
 			<if test="teacherId != null">
 				AND tdmgs.user_id_ = #{teacherId}
 			</if>
-			<if test="settlementType != null">
-				AND tdmgs.settlement_type_ = #{settlementType}
-			</if>
 		</where>
 	</sql>
 
@@ -118,7 +111,6 @@
 	<select id="getTeacherSalaryByUserIdAndType" resultMap="TeacherDefaultMusicGroupSalary">
 		SELECT * FROM teacher_default_music_group_salary
 		WHERE user_id_=#{userId} AND course_schedule_type_ = #{classGroupType}
-		AND settlement_type_ = #{settlementType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	</select>
 
 	<select id="findByTeacher" resultMap="TeacherDefaultMusicGroupSalary">