zouxuan 5 年之前
父节点
当前提交
0cc7099ece

+ 40 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceComplaintsDto.java

@@ -5,7 +5,6 @@ import com.ym.mec.biz.dal.enums.SignInStatusEnum;
 import com.ym.mec.biz.dal.enums.SignOutStatusEnum;
 
 public class TeacherAttendanceComplaintsDto{
-
     private String organName;
 
     private Long courseScheduleId;
@@ -24,6 +23,46 @@ public class TeacherAttendanceComplaintsDto{
 
     private String operatorName;
 
+    private String signInTime;
+
+    private String signOutTime;
+
+    private String complaintsContent;
+
+    private String disposeContent;
+
+    public String getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(String signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public String getSignOutTime() {
+        return signOutTime;
+    }
+
+    public void setSignOutTime(String signOutTime) {
+        this.signOutTime = signOutTime;
+    }
+
+    public String getComplaintsContent() {
+        return complaintsContent;
+    }
+
+    public void setComplaintsContent(String complaintsContent) {
+        this.complaintsContent = complaintsContent;
+    }
+
+    public String getDisposeContent() {
+        return disposeContent;
+    }
+
+    public void setDisposeContent(String disposeContent) {
+        this.disposeContent = disposeContent;
+    }
+
     public String getOrganName() {
         return organName;
     }

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -602,7 +602,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		teacherId.forEach(e->{
 			receivers.put(e,e.toString());
 		});
-		String url = new StringBuffer("8?").append(sysConfigDao.findConfigValue(SysConfigService.TEACHER_BASE_URL)).append("/#/appealResult?date=").append(format).toString();
+		String url = new StringBuffer("10?date=").append(format).toString();
 		sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.PUSH_TEACHER_EXCEPTION_ATTENDANCE,receivers,null,0,url,"TEACHER",format);
 	}
 

+ 7 - 2
mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -466,12 +466,17 @@
         <result property="teacherName" column="teacher_name_"/>
         <result property="complaintsStatusEnum" column="complain_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="operatorName" column="operator_name_"/>
+        <result property="signInTime" column="sign_in_time_"/>
+        <result property="signOutTime" column="sign_out_time_"/>
+        <result property="complaintsContent" column="complaints_content_"/>
+        <result property="disposeContent" column="dispose_content_"/>
     </resultMap>
-    <select id="queryTeacherAttendanceComplaints" resultType="com.ym.mec.biz.dal.dto.TeacherAttendanceComplaintsDto">
+    <select id="queryTeacherAttendanceComplaints" resultMap="TeacherAttendanceComplaintsDtoMap">
         SELECT o.name_ organ_name_,ta.course_schedule_id_,cs.name_ course_schedule_name_,cs.class_date_ course_schedule_time_,
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
-        suo.real_name_ operator_name_,su.real_name_ teacher_name_,ta.complaints_status_
+        suo.real_name_ operator_name_,su.real_name_ teacher_name_,ta.complaints_status_,ta.sign_in_time_,ta.sign_out_time_
+        ,ta.complaints_content_,ta.dispose_content_
         FROM teacher_attendance ta
         LEFT JOIN sys_user su ON ta.teacher_id_ = su.id_
         LEFT JOIN teacher t ON t.id_ = su.id_