feat:报表中心异常导出

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

@@ -81,6 +81,14 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程编号搜索")
     private Long courseIdSearch;
 
+    private String generateStartTime;
+
+    private String generateEndTime;
+
+    private String dealStartTime;
+
+    private String dealEndTime;
+
     public Long getCourseIdSearch() {
         return courseIdSearch;
     }
@@ -264,4 +272,36 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     public void setTeachType(TeachTypeEnum teachType) {
         this.teachType = teachType;
     }
+
+    public String getGenerateStartTime() {
+        return generateStartTime;
+    }
+
+    public void setGenerateStartTime(String generateStartTime) {
+        this.generateStartTime = generateStartTime;
+    }
+
+    public String getGenerateEndTime() {
+        return generateEndTime;
+    }
+
+    public void setGenerateEndTime(String generateEndTime) {
+        this.generateEndTime = generateEndTime;
+    }
+
+    public String getDealStartTime() {
+        return dealStartTime;
+    }
+
+    public void setDealStartTime(String dealStartTime) {
+        this.dealStartTime = dealStartTime;
+    }
+
+    public String getDealEndTime() {
+        return dealEndTime;
+    }
+
+    public void setDealEndTime(String dealEndTime) {
+        this.dealEndTime = dealEndTime;
+    }
 }

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

@@ -46,6 +46,14 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
 
     private String searchStartTime;
 
+    private String generateStartTime;
+
+    private String generateEndTime;
+
+    private String dealStartTime;
+
+    private String dealEndTime;
+
     public String getSearchStartTime() {
         return searchStartTime;
     }
@@ -158,4 +166,36 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     public void setIds(String ids) {
         this.ids = ids;
     }
+
+    public String getGenerateStartTime() {
+        return generateStartTime;
+    }
+
+    public void setGenerateStartTime(String generateStartTime) {
+        this.generateStartTime = generateStartTime;
+    }
+
+    public String getGenerateEndTime() {
+        return generateEndTime;
+    }
+
+    public void setGenerateEndTime(String generateEndTime) {
+        this.generateEndTime = generateEndTime;
+    }
+
+    public String getDealStartTime() {
+        return dealStartTime;
+    }
+
+    public void setDealStartTime(String dealStartTime) {
+        this.dealStartTime = dealStartTime;
+    }
+
+    public String getDealEndTime() {
+        return dealEndTime;
+    }
+
+    public void setDealEndTime(String dealEndTime) {
+        this.dealEndTime = dealEndTime;
+    }
 }

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

@@ -31,6 +31,14 @@ public class InspectionQueryInfo extends QueryInfo {
 
     private String searchStartTime;
 
+    private String generateStartTime;
+
+    private String generateEndTime;
+
+    private String dealStartTime;
+
+    private String dealEndTime;
+
     public String getSearchStartTime() {
         return searchStartTime;
     }
@@ -102,4 +110,36 @@ public class InspectionQueryInfo extends QueryInfo {
     public void setIds(String ids) {
         this.ids = ids;
     }
+
+    public String getGenerateStartTime() {
+        return generateStartTime;
+    }
+
+    public void setGenerateStartTime(String generateStartTime) {
+        this.generateStartTime = generateStartTime;
+    }
+
+    public String getGenerateEndTime() {
+        return generateEndTime;
+    }
+
+    public void setGenerateEndTime(String generateEndTime) {
+        this.generateEndTime = generateEndTime;
+    }
+
+    public String getDealStartTime() {
+        return dealStartTime;
+    }
+
+    public void setDealStartTime(String dealStartTime) {
+        this.dealStartTime = dealStartTime;
+    }
+
+    public String getDealEndTime() {
+        return dealEndTime;
+    }
+
+    public void setDealEndTime(String dealEndTime) {
+        this.dealEndTime = dealEndTime;
+    }
 }

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

@@ -364,10 +364,22 @@
 				AND iip.status_ = 0
 			</if>
 			<if test="startTime != null">
-				AND irdr.generate_time_ >= #{startTime}
+				AND iip.plan_start_ >= #{startTime}
 			</if>
 			<if test="endTime != null">
-				<![CDATA[AND irdr.generate_time_ <= #{endTime}]]>
+				<![CDATA[AND iip.plan_start_ <= #{endTime}]]>
+			</if>
+			<if test="generateStartTime != null">
+				AND irdr.generate_time_ >= #{generateStartTime}
+			</if>
+			<if test="generateEndTime != null">
+				<![CDATA[AND irdr.generate_time_ <= #{generateEndTime}]]>
+			</if>
+			<if test="dealStartTime != null">
+				AND DATE_FORMAT(irdr.deal_time_,"%Y-%m-%d") >= #{dealStartTime}
+			</if>
+			<if test="dealEndTime != null">
+				<![CDATA[AND DATE_FORMAT(irdr.deal_time_,"%Y-%m-%d") <= #{dealEndTime}]]>
 			</if>
 			<if test="search != null">
 				AND mg.name_ LIKE CONCAT('%', #{search}, '%')
@@ -416,10 +428,22 @@
 				AND FIND_IN_SET(ii.id_,#{ids})
 			</if>
 			<if test="startTime != null">
-				AND irdr.generate_time_ >= #{startTime}
+				AND i.month_ >= #{startTime}
 			</if>
 			<if test="endTime != null">
-				<![CDATA[AND irdr.generate_time_ <= #{endTime}]]>
+				<![CDATA[AND i.month_ <= #{endTime}]]>
+			</if>
+			<if test="generateStartTime != null">
+				AND irdr.generate_time_ >= #{generateStartTime}
+			</if>
+			<if test="generateEndTime != null">
+				<![CDATA[AND irdr.generate_time_ <= #{generateEndTime}]]>
+			</if>
+			<if test="dealStartTime != null">
+				AND DATE_FORMAT(irdr.deal_time_,"%Y-%m-%d") >= #{dealStartTime}
+			</if>
+			<if test="dealEndTime != null">
+				<![CDATA[AND DATE_FORMAT(irdr.deal_time_,"%Y-%m-%d") <= #{dealEndTime}]]>
 			</if>
 		</where>
 	</sql>
@@ -514,10 +538,22 @@
 				AND sa.id_ IS NULL
 			</if>
 			<if test="startTime!=null">
-				AND irdr.generate_time_ &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
+				AND cs.class_date_ &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
 			</if>
 			<if test="endTime!=null">
-				AND irdr.generate_time_ &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
+				AND cs.class_date_ &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
+			</if>
+			<if test="generateStartTime != null">
+				AND irdr.generate_time_ >= #{generateStartTime}
+			</if>
+			<if test="generateEndTime != null">
+				<![CDATA[AND irdr.generate_time_ <= #{generateEndTime}]]>
+			</if>
+			<if test="dealStartTime != null">
+				AND DATE_FORMAT(irdr.deal_time_,"%Y-%m-%d") >= #{dealStartTime}
+			</if>
+			<if test="dealEndTime != null">
+				<![CDATA[AND DATE_FORMAT(irdr.deal_time_,"%Y-%m-%d") <= #{dealEndTime}]]>
 			</if>
 			<if test="courseStatus!=null">
 				AND cs.status_ = #{courseStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}