Quellcode durchsuchen

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

yonge vor 5 Jahren
Ursprung
Commit
f52d4dbcf1

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SalarySettlementTypeEnum.java

@@ -11,7 +11,8 @@ public enum SalarySettlementTypeEnum implements BaseEnum<String,SalarySettlement
     TEACHER_DEFAULT("TEACHER_DEFAULT","老师默认课酬"),
     RATIO_DISCOUNT("RATIO_DISCOUNT","课程单价比例折扣"),
     FIXED_SALARY("FIXED_SALARY","固定课酬"),
-    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬");
+    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬"),
+    CLASSROOM_SALARY("CLASSROOM_SALARY","课堂课酬");
 
     private String code;
 

+ 4 - 2
mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -417,7 +417,9 @@
 
     <!-- 批量开启缴费 -->
     <update id="batchOpenPay">
-        UPDATE student_registration SET payment_status_ = #{paymentStatus},update_time_ = now()
-        WHERE FIND_IN_SET(id_,#{ids}) AND payment_status_ = 0
+        UPDATE student_registration
+        SET payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        update_time_ = now()
+        WHERE FIND_IN_SET(id_,#{ids}) AND payment_status_ = '0'
     </update>
 </mapper>