feat:报表中心异常导出

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleEndDto.java

@@ -50,6 +50,27 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private boolean beMerged;
 
+    private Date generateTime;
+
+    /** 处理时间 */
+    private java.util.Date dealTime;
+
+    public Date getGenerateTime() {
+        return generateTime;
+    }
+
+    public void setGenerateTime(Date generateTime) {
+        this.generateTime = generateTime;
+    }
+
+    public Date getDealTime() {
+        return dealTime;
+    }
+
+    public void setDealTime(Date dealTime) {
+        this.dealTime = dealTime;
+    }
+
     public String getEducationTeacherName() {
         return educationTeacherName;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItem.java

@@ -88,6 +88,27 @@ public class InspectionItem {
     @ApiModelProperty(value = "主管名字")
     private String userName;
 
+    private Date generateTime;
+
+    /** 处理时间 */
+    private java.util.Date dealTime;
+
+    public Date getGenerateTime() {
+        return generateTime;
+    }
+
+    public void setGenerateTime(Date generateTime) {
+        this.generateTime = generateTime;
+    }
+
+    public Date getDealTime() {
+        return dealTime;
+    }
+
+    public void setDealTime(Date dealTime) {
+        this.dealTime = dealTime;
+    }
+
     public Long getId() {
         return id;
     }
@@ -207,4 +228,4 @@ public class InspectionItem {
     public void setUserName(String userName) {
         this.userName = userName;
     }
-}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -136,6 +136,27 @@ public class InspectionItemPlan {
     @ApiModelProperty(value = "乐团主管名字")
     private String realName;
 
+    private Date generateTime;
+
+    /** 处理时间 */
+    private java.util.Date dealTime;
+
+    public Date getGenerateTime() {
+        return generateTime;
+    }
+
+    public void setGenerateTime(Date generateTime) {
+        this.generateTime = generateTime;
+    }
+
+    public Date getDealTime() {
+        return dealTime;
+    }
+
+    public void setDealTime(Date dealTime) {
+        this.dealTime = dealTime;
+    }
+
     public Long getId() {
         return id;
     }
@@ -327,4 +348,4 @@ public class InspectionItemPlan {
     public void setOperatorUserId(Integer operatorUserId) {
         this.operatorUserId = operatorUserId;
     }
-}
+}

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

@@ -268,7 +268,8 @@
 	</select>
 
 	<select id="queryErrInspectionData" resultMap="com.ym.mec.biz.dal.dao.InspectionItemPlanDao.InspectionItemPlan" parameterType="map">
-		SELECT iip.*,su.real_name_ realName,o.name_ organName,co.name_ cooperationName,mg.name_ musicGroupName
+		SELECT iip.*,su.real_name_ realName,o.name_ organName,co.name_ cooperationName,mg.name_ musicGroupName,
+		       irdr.generate_time_ generateTime,irdr.deal_time_ dealTime
 		FROM index_err_data_record irdr
 		LEFT JOIN inspection_item_plan iip ON irdr.data_id_=iip.id_
 		LEFT JOIN sys_user su ON su.id_ = iip.user_id_
@@ -341,7 +342,8 @@
 	</sql>
 
 	<select id="queryErrStudentVisit" resultMap="com.ym.mec.biz.dal.dao.InspectionItemDao.InspectionItem" parameterType="map">
-		SELECT ii.*,i.month_ month,o.name_ organName,su.real_name_ userName
+		SELECT ii.*,i.month_ month,o.name_ organName,su.real_name_ userName,
+			irdr.generate_time_ generateTime,irdr.deal_time_ dealTime
 		FROM index_err_data_record irdr
 		LEFT JOIN inspection_item ii ON irdr.data_id_=ii.id_
 		LEFT JOIN inspection i ON i.id_ = ii.inspection_id_
@@ -406,6 +408,8 @@
 			cs.organ_id_,
 			s.name_ schoole_name_,
 			o.name_ organ_name_,
+			irdr.generate_time_ generateTime,
+		    irdr.deal_time_ dealTime,
 			CASE WHEN COUNT(CASE WHEN sa.id_ IS NULL OR (sa.status_ = 'LEAVE' AND sa.remark_ IS NOT NULL) THEN NULL ELSE 1 END) > 0 THEN 1 ELSE 0 END isCallNames,
 			CASE WHEN COUNT(CASE WHEN ta.is_complaints_ = 1 THEN 1 ELSE NULL END) > 0 THEN '1' ELSE '0' END is_complaints_
 		FROM index_err_data_record irdr