Prechádzať zdrojové kódy

1、课酬确认相关
2、VIP课导出添加学生姓名和编号

Joburgess 5 rokov pred
rodič
commit
3ce9fd0e91

+ 7 - 7
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/TeacherSalaryConfirmStatus.java

@@ -6,22 +6,22 @@ import com.ym.mec.common.enums.BaseEnum;
  * @Author Joburgess
  * @Date 2020/4/16
  */
-public enum  TeacherSalaryConfirmStatus implements BaseEnum<String, TeacherSalaryConfirmStatus> {
-    UNCONFIRMED("1", "待确认"),
-    CONFIRMED("2", "已确认"),
-    COMPLETED("3", "已完成");
+public enum  TeacherSalaryConfirmStatus implements BaseEnum<Integer, TeacherSalaryConfirmStatus> {
+    UNCONFIRMED(1, "待确认"),
+    CONFIRMED(2, "已确认"),
+    COMPLETED(3, "已完成");
 
-    private String code;
+    private Integer code;
 
     private String desc;
 
-    private TeacherSalaryConfirmStatus(String code, String desc) {
+    private TeacherSalaryConfirmStatus(Integer code, String desc) {
         this.code = code;
         this.desc = desc;
     }
 
     @Override
-    public String getCode() {
+    public Integer getCode() {
         return code;
     }
 

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -771,7 +771,7 @@
 				AND ta.sign_out_status_=#{signOutStatus}
 			</if>
 			<if test="confirmStatus!=null">
-				AND csts.reduce_salary=#{confirmStatus}
+				AND csts.reduce_salary=#{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="groupName!=null">
 				AND cs.name_ LIKE CONCAT('%', #{groupName}, '%')