Merge branch 'teacher_client_salary'

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

@@ -1297,7 +1297,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<CourseSchedule> getTeacherCourseWithClassDate(@Param("teacherId") Integer teacherId,
                                                        @Param("startDay") String startDay,
                                                        @Param("endDay") String endDay,
-                                                       @Param("courseStatus") CourseStatusEnum courseStatus);
+                                                       @Param("courseStatus") CourseStatusEnum courseStatus,
+                                                       @Param("teachIncomeType") String teachIncomeType);
 
     /**
      * @describe 查询教师课程

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

@@ -544,7 +544,8 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 													@Param("startDay") String startDay,
 													@Param("endDay") String endDay,
 													@Param("startClassDay") String startClassDay,
-													@Param("courseStatus") CourseStatusEnum courseStatus);
+													@Param("courseStatus") CourseStatusEnum courseStatus,
+													@Param("teachIncomeType") String teachIncomeType);
 
 	/**
 	 * @describe 教师年度收入统计

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/TeachIncomeTypeEnum.java

@@ -0,0 +1,35 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum TeachIncomeTypeEnum implements BaseEnum<String, TeachIncomeTypeEnum> {
+	SALARY("SALARY", "课酬"),
+	SUBSIDY("SUBSIDY", "教学点补贴"),
+	SALE_REWARD("SALE_REWARD", "销售奖励");
+
+	private String code;
+
+	private String msg;
+
+	TeachIncomeTypeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherIncomeQueryInfo.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachIncomeTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 
 /**
@@ -19,6 +20,8 @@ public class TeacherIncomeQueryInfo extends QueryInfo {
 
     private Boolean updated = false;
 
+    private String teachIncomeType;
+
     public Integer getTeacherId() {
         return teacherId;
     }
@@ -58,4 +61,12 @@ public class TeacherIncomeQueryInfo extends QueryInfo {
     public void setUpdated(Boolean updated) {
         this.updated = updated;
     }
+
+    public String getTeachIncomeType() {
+        return teachIncomeType;
+    }
+
+    public void setTeachIncomeType(String teachIncomeType) {
+        this.teachIncomeType = teachIncomeType;
+    }
 }

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

@@ -2058,9 +2058,12 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
     @Override
     public TeacherIncomeReviewDto getTeacherSalaryOverview(TeacherIncomeQueryInfo queryInfo) {
-        LocalDate nowDate = LocalDate.now();
+        if(Objects.nonNull(queryInfo)&&TeachIncomeTypeEnum.SALE_REWARD.equals(queryInfo.getTeachIncomeType())){
+            TeacherIncomeReviewDto teacherSalaryOverview = new TeacherIncomeReviewDto();
+            return teacherSalaryOverview;
+        }
 
-        TeacherIncomeReviewDto teacherSalaryOverview = courseScheduleTeacherSalaryDao.getTeacherSalaryOverview(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), "2021-03-01", null);
+        TeacherIncomeReviewDto teacherSalaryOverview = courseScheduleTeacherSalaryDao.getTeacherSalaryOverview(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), "2021-03-01", null, queryInfo.getTeachIncomeType());
         if(Objects.isNull(teacherSalaryOverview)){
             teacherSalaryOverview = new TeacherIncomeReviewDto();
         }
@@ -2068,7 +2071,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             teacherSalaryOverview.setThisMonthExpectIncome(BigDecimal.ZERO);
         }
 
-        List<CourseSchedule> teacherCourses = courseScheduleDao.getTeacherCourseWithClassDate(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), CourseStatusEnum.OVER);
+        List<CourseSchedule> teacherCourses = courseScheduleDao.getTeacherCourseWithClassDate(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), CourseStatusEnum.OVER, queryInfo.getTeachIncomeType());
         if(CollectionUtils.isEmpty(teacherCourses)){
             return teacherSalaryOverview;
         }
@@ -2170,6 +2173,13 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
+
+        if(Objects.nonNull(queryInfo)&&TeachIncomeTypeEnum.SALE_REWARD.equals(queryInfo.getTeachIncomeType())){
+            pageInfo.setTotal(0);
+            pageInfo.setRows(Collections.EMPTY_LIST);
+            return pageInfo;
+        }
+
         int count = courseScheduleDao.countTeacherCourse(params);
         pageInfo.setTotal(count);
         params.put("offset", pageInfo.getOffset());

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

@@ -3751,6 +3751,7 @@
         FROM
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
+            LEFT JOIN school s ON cs.schoole_id_=s.id_
         WHERE
             ( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
             AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
@@ -3765,6 +3766,9 @@
             <if test="courseStatus!=null">
                 AND cs.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
+            <if test="teachIncomeType!=null and teachIncomeType=='SUBSIDY'">
+                AND IF(csts.settlement_time_ IS NULL, s.subsidy_ IS NOT NULL AND s.subsidy_>0, csts.subsidy_ IS NOT NULL AND csts.subsidy_>0)
+            </if>
     </select>
 
     <sql id="queryTeacherCourseCondition">
@@ -3785,6 +3789,9 @@
             <if test="courseStatus!=null">
                 AND cs.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
+            <if test="teachIncomeType!=null and teachIncomeType=='SUBSIDY'">
+                AND IF(csts.settlement_time_ IS NULL, s.subsidy_ IS NOT NULL AND s.subsidy_>0, csts.subsidy_ IS NOT NULL AND csts.subsidy_>0)
+            </if>
         </where>
     </sql>
 
@@ -3794,6 +3801,7 @@
         FROM
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
+            LEFT JOIN school s ON cs.schoole_id_=s.id_
         <include refid="queryTeacherCourseCondition"></include>
         ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC,cs.id_ DESC
         <include refid="global.limit" />
@@ -3805,6 +3813,7 @@
         FROM
         course_schedule cs
         LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
+        LEFT JOIN school s ON cs.schoole_id_=s.id_
         <include refid="queryTeacherCourseCondition"></include>
     </select>
 

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

@@ -1089,6 +1089,9 @@
 					<if test="endDay!=null and endDay!=''">
 						AND cs.class_date_ &lt;= #{endDay}
 					</if>
+			    	<if test="teachIncomeType!=null and teachIncomeType=='SUBSIDY'">
+						AND IF(csts.settlement_time_ IS NULL, s.subsidy_ IS NOT NULL AND s.subsidy_>0, csts.subsidy_ IS NOT NULL AND csts.subsidy_>0)
+					</if>
 			    THEN csts.expect_salary_ + IF(s.subsidy_ IS NULL, 0, s.subsidy_) ELSE 0 END)) thisMonthExpectIncome
 		FROM
 			course_schedule_teacher_salary csts