Browse Source

feat:考勤申诉增加是否结算查询条件

Joburgess 4 years ago
parent
commit
7747789c79

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherAttendanceComplaintsQueryInfo.java

@@ -20,6 +20,17 @@ public class TeacherAttendanceComplaintsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程结束时间")
     private String courseScheduleEndDate;
 
+    @ApiModelProperty(value = "是否已结算")
+    private Boolean settlemented;
+
+    public Boolean getSettlemented() {
+        return settlemented;
+    }
+
+    public void setSettlemented(Boolean settlemented) {
+        this.settlemented = settlemented;
+    }
+
     public String getCourseScheduleStartDate() {
         return courseScheduleStartDate;
     }

+ 6 - 0
mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -589,6 +589,12 @@
             <if test="courseScheduleEndDate != null and courseScheduleEndDate != ''">
                 AND cs.class_date_ &lt;= #{courseScheduleEndDate}
             </if>
+            <if test="settlemented!=null and settlemented=true">
+                AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NOT NULL)
+            </if>
+            <if test="settlemented!=null and settlemented=false">
+                AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
+            </if>
         </where>
     </sql>
     <select id="countTeacherAttendanceComplaints" resultType="java.lang.Integer">