Browse Source

feat:报表中心异常导出

Joburgess 4 năm trước cách đây
mục cha
commit
c6cd7a2138

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/EndCourseScheduleQueryInfo.java

@@ -89,6 +89,16 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
 
     private String dealEndTime;
 
+    private Boolean hasDealTime;
+
+    public Boolean getHasDealTime() {
+        return hasDealTime;
+    }
+
+    public void setHasDealTime(Boolean hasDealTime) {
+        this.hasDealTime = hasDealTime;
+    }
+
     public Long getCourseIdSearch() {
         return courseIdSearch;
     }

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/InspectionItemPlanQueryInfo.java

@@ -54,6 +54,16 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
 
     private String dealEndTime;
 
+    private Boolean hasDealTime;
+
+    public Boolean getHasDealTime() {
+        return hasDealTime;
+    }
+
+    public void setHasDealTime(Boolean hasDealTime) {
+        this.hasDealTime = hasDealTime;
+    }
+
     public String getSearchStartTime() {
         return searchStartTime;
     }

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/InspectionQueryInfo.java

@@ -39,6 +39,16 @@ public class InspectionQueryInfo extends QueryInfo {
 
     private String dealEndTime;
 
+    private Boolean hasDealTime;
+
+    public Boolean getHasDealTime() {
+        return hasDealTime;
+    }
+
+    public void setHasDealTime(Boolean hasDealTime) {
+        this.hasDealTime = hasDealTime;
+    }
+
     public String getSearchStartTime() {
         return searchStartTime;
     }

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

@@ -344,6 +344,12 @@
 					irdr.data_type_ = 'INSPECTION_ITEM_PLAN'
 				</if>
 			</if>
+			<if test="hasDealTime!=null and hasDealTime">
+				AND irdr.deal_time_ IS NOT NULL
+			</if>
+			<if test="hasDealTime!=null and !hasDealTime">
+				AND irdr.deal_time_ IS NULL
+			</if>
 			<if test="itemId != null">
 				AND iip.item_id_ = #{itemId}
 			</if>
@@ -423,6 +429,12 @@
 	<sql id="queryErrStudentVisitCondition">
 		<where>
 			irdr.data_type_ = 'STUDENT_VISIT'
+			<if test="hasDealTime!=null and hasDealTime">
+				AND irdr.deal_time_ IS NOT NULL
+			</if>
+			<if test="hasDealTime!=null and !hasDealTime">
+				AND irdr.deal_time_ IS NULL
+			</if>
 			<if test="organId != null">
 				AND FIND_IN_SET(ii.organ_id_,#{organId})
 			</if>
@@ -533,13 +545,18 @@
 
 	<sql id="endFindCourseSchedulesCondition">
 		<where>
-			cs.del_flag_ = 0
 			<if test="searchType == 'ERR_ATTENDANCE'">
 				AND irdr.data_type_ = 'TEACHER_EXCEPTION_ATTENDANCE'
 			</if>
 			<if test="searchType == 'NO_ATTENDANCE'">
 				AND irdr.data_type_ = 'TEACHER_NOT_A_CLASS'
 			</if>
+			<if test="hasDealTime!=null and hasDealTime">
+				AND irdr.deal_time_ IS NOT NULL
+			</if>
+			<if test="hasDealTime!=null and !hasDealTime">
+				AND irdr.deal_time_ IS NULL
+			</if>
 			<if test="mergeCourseType != null and mergeCourseType != ''">
 				<if test="mergeCourseType == 'MASTER'">
 					AND cs.new_course_id_ = cs.id_