Merge remote-tracking branch 'origin/2021-04-28' into 2021-04-28

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

@@ -35,6 +35,9 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "课程名",required = false)
     private String courseScheduleName;
 
+    @ApiModelProperty(value = "处理意见",required = false)
+    private String disposeContent;
+
     @ApiModelProperty(value = "课程状态",required = false)
     private CourseStatusEnum courseScheduleStatus;
 
@@ -76,6 +79,14 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "申述处理状态",required = false)
     private ComplaintsStatusEnum complaintsStatus;
 
+    public String getDisposeContent() {
+        return disposeContent;
+    }
+
+    public void setDisposeContent(String disposeContent) {
+        this.disposeContent = disposeContent;
+    }
+
     public Long getTeacherAttendanceId() {
         return teacherAttendanceId;
     }

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

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.List;
 
+import static com.ym.mec.biz.dal.enums.YesOrNoEnum.YES;
+
 /**
  * 对应数据库表(questionnaire_question):
  */
@@ -25,9 +28,9 @@ public class QuestionnaireQuestion {
 	private Integer sort = 0;
 	
 	/** 是否必填 */
-	private boolean isRequire = true;
+	private YesOrNoEnum isRequire = YES;
 
-	private boolean delFlag = false;
+	private YesOrNoEnum delFlag = YES;
 
 	/** 问题描述 */
 	private String desc;
@@ -44,13 +47,6 @@ public class QuestionnaireQuestion {
 	//题目答案选项
 	private List<QuestionnaireQuestionItem> questionnaireQuestionItemList;
 
-	public boolean getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(boolean delFlag) {
-		this.delFlag = delFlag;
-	}
 
 	public List<Long> getDelQuestionnaireQuestionItemIdList() {
 		return delQuestionnaireQuestionItemIdList;
@@ -107,15 +103,23 @@ public class QuestionnaireQuestion {
 	public Integer getSort(){
 		return this.sort;
 	}
-			
-	public void setIsRequire(boolean isRequire){
+
+	public YesOrNoEnum getIsRequire() {
+		return isRequire;
+	}
+
+	public void setIsRequire(YesOrNoEnum isRequire) {
 		this.isRequire = isRequire;
 	}
-	
-	public boolean getIsIsRequire(){
-		return this.isRequire;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-			
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public void setDesc(String desc){
 		this.desc = desc;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -22,9 +23,9 @@ public class QuestionnaireQuestionItem {
 	/** 排序 */
 	private Integer sort = 0;
 
-	private Boolean isOver = false;
+	private YesOrNoEnum isOver = YesOrNoEnum.NO;
 
-	private Boolean delFlag = false;
+	private YesOrNoEnum delFlag = YesOrNoEnum.NO;
 
 	/**  */
 	private java.util.Date createTime;
@@ -32,20 +33,20 @@ public class QuestionnaireQuestionItem {
 	/**  */
 	private java.util.Date updateTime;
 
-	public Boolean getDelFlag() {
-		return delFlag;
+	public YesOrNoEnum getIsOver() {
+		return isOver;
 	}
 
-	public void setDelFlag(Boolean delFlag) {
-		this.delFlag = delFlag;
+	public void setIsOver(YesOrNoEnum isOver) {
+		this.isOver = isOver;
 	}
 
-	public Boolean getIsOver() {
-		return isOver;
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
 
-	public void setIsOver(Boolean over) {
-		isOver = over;
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
 
 	public void setId(Long id){

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.List;
@@ -16,9 +17,9 @@ public class QuestionnaireTopic {
 	private String title;
 	
 	/** 发布状态（1-可见  0-不可见） */
-	private boolean status = false;
+	private YesOrNoEnum status = YesOrNoEnum.NO;
 
-	private boolean delFlag = false;
+	private YesOrNoEnum delFlag = YesOrNoEnum.NO;
 
 	/** 创建人编号 */
 	private Integer creatorId;
@@ -35,14 +36,6 @@ public class QuestionnaireTopic {
 	//问卷题目
 	private List<QuestionnaireQuestion> questionnaireQuestionList;
 
-	public boolean getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(boolean delFlag) {
-		this.delFlag = delFlag;
-	}
-
 	public List<QuestionnaireQuestion> getQuestionnaireQuestionList() {
 		return questionnaireQuestionList;
 	}
@@ -74,15 +67,23 @@ public class QuestionnaireTopic {
 	public String getTitle(){
 		return this.title;
 	}
-			
-	public void setStatus(boolean status){
+
+	public YesOrNoEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(YesOrNoEnum status) {
 		this.status = status;
 	}
-	
-	public boolean isStatus(){
-		return this.status;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-			
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public void setCreatorId(Integer creatorId){
 		this.creatorId = creatorId;
 	}

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

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.page.QueryInfo;
+
+public class QuestionnaireTopicQueryInfo extends QueryInfo {
+
+    private YesOrNoEnum status;
+
+    public YesOrNoEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(YesOrNoEnum status) {
+        this.status = status;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -482,26 +482,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			three.setDesc(IndexErrorType.TEACHER_INFO.getMsg());
 			List<IndexErrInfoDto> threeChild = new ArrayList<>();
 
-//			int teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
-//			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_LEAVE, IndexErrorType.TEACHER_LEAVE.getMsg(),teacherLeave, null));
-
-			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-
-			//全职未离职老师
-			//预计课酬较低
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
-
 			//课程时间安排异常
 			Integer userId = null;
 			if (!userRole.contains(SysUserRole.SECTION_MANAGER) && !sysUser.getIsSuperAdmin()) {
 				userId = sysUser.getId();
 			}
-			int courseTimeError = 0;
-			if(classGroupIds == null || classGroupIds.size() > 0){
-				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
-			}
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TIME_ERROR, IndexErrorType.COURSE_TIME_ERROR.getMsg(), courseTimeError, null));
 
 			//乐团巡查任务未计划
 			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId);
@@ -529,10 +514,21 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			//课程考勤异常
 			int attendanceError = 0;
 			int noAttendance = 0;
+			//课程时间安排异常
+			int courseTimeError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
 				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds);
 				noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime,classGroupIds);
+				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
 			}
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			//全职未离职老师
+			//预计课酬较低
+			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
+
+			fourChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TIME_ERROR, IndexErrorType.COURSE_TIME_ERROR.getMsg(), courseTimeError, null));
+
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE, IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE.getMsg(), attendanceError, null));
 
 			//课程异常
@@ -885,26 +881,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				flag3 = true;
 			}
 		}
-		if(!flag3){
-			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-			if(lowTeacherSalary > 0){
-				flag3 = true;
-			}
-		}
+
 		Integer userId = null;
 		if (!userRole.contains(SysUserRole.SECTION_MANAGER) && !sysUser.getIsSuperAdmin()) {
 			userId = sysUser.getId();
 		}
-		if(!flag3){
-			int courseTimeError = 0;
-			if(classGroupIds == null || classGroupIds.size() > 0){
-				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
-			}
-			if(courseTimeError > 0){
-				flag3 = true;
-			}
-		}
+
 		if(!flag3){
 			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId);
 			if(inspectionItem > 0){
@@ -927,6 +909,22 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		boolean flag4 = false;
 		if(!flag4){
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			if(lowTeacherSalary > 0){
+				flag4 = true;
+			}
+		}
+		if(!flag4){
+			int courseTimeError = 0;
+			if(classGroupIds == null || classGroupIds.size() > 0){
+				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
+			}
+			if(courseTimeError > 0){
+				flag4 = true;
+			}
+		}
+		if(!flag4){
 			int attendanceError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
 				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireTopicServiceImpl.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dao.QuestionnaireQuestionItemDao;
 import com.ym.mec.biz.dal.dao.QuestionnaireUserResultDao;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.biz.service.QuestionnaireTopicService;
@@ -68,9 +69,12 @@ public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, Ques
 		questionnaireTopicDao.update(questionnaireTopic);
 		Integer topicId = questionnaireTopic.getId();
 		List<Long> delQuestionnaireQuestionIdList = questionnaireTopic.getDelQuestionnaireQuestionIdList();
+		//调查问卷是否有用户参与
+		int num = questionnaireUserResultDao.countByTopicId(topicId);
 		if(delQuestionnaireQuestionIdList != null && delQuestionnaireQuestionIdList.size() > 0){
-			//调查问卷是否有用户参与
-			int num = questionnaireUserResultDao.countByTopicId(topicId);
+			if(num > 0){
+				throw new BizException("操作失败：该调查问卷已使用");
+			}
 			questionnaireQuestionDao.batchDel(delQuestionnaireQuestionIdList);
 			questionnaireQuestionItemDao.batchDelByQuestionIdList(delQuestionnaireQuestionIdList);
 		}
@@ -83,6 +87,9 @@ public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, Ques
 					//需要删除的问题答案
 					List<Long> delQuestionnaireQuestionItemIdList = question.getDelQuestionnaireQuestionItemIdList();
 					if(delQuestionnaireQuestionItemIdList != null && delQuestionnaireQuestionItemIdList.size() > 0){
+						if(num > 0){
+							throw new BizException("操作失败：该调查问卷已使用");
+						}
 						questionnaireQuestionItemDao.batchDelByQuestionIdList(delQuestionnaireQuestionItemIdList);
 					}
 					questionnaireQuestionDao.update(question);

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

@@ -1188,12 +1188,14 @@
 			COUNT( sr.user_id_ ) num2
 		FROM
 			student_registration sr
-				LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-				LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
+			LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+			LEFT JOIN `subject` sub ON sr.actual_subject_id_=sub.id_
+			LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
 		WHERE
 			sr.music_group_status_ = 'NORMAL'
 			AND mg.status_ = 'PROGRESS'
 			AND cgsm.id_ IS NULL
+			AND sub.parent_subject_id_!=24
 			<if test="educationUserId != null">
 				AND mg.educational_teacher_id_ = #{educationUserId}
 			</if>
@@ -1212,11 +1214,13 @@
 		FROM
 		student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+		LEFT JOIN `subject` sub ON sr.actual_subject_id_=sub.id_
 		LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
 		WHERE
 		sr.music_group_status_ = 'NORMAL'
 		AND mg.status_ = 'PROGRESS'
 		AND cgsm.id_ IS NULL
+		AND sub.parent_subject_id_!=24
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>

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

@@ -12,10 +12,10 @@
 		<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
 		<result column="answer_value_" property="answerValue" />
 		<result column="sort_" property="sort" />
-		<result column="is_over_" property="isOver" />
+		<result column="is_over_" property="isOver" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
+		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -30,15 +30,15 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},NOW(),NOW())
+		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
+		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),NOW())
 	</insert>
 
     <insert id="batchInsert" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
 		VALUES
 		<foreach collection="questionItemList" item="item" separator=",">
-			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver},NOW(),NOW())
+			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),NOW())
 		</foreach>
 	</insert>
 
@@ -52,7 +52,7 @@
 			sort_ = #{sort},
 		</if>
 		<if test="isOver != null">
-			is_over_ = #{isOver},
+			is_over_ = #{isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="answerValue != null">
 			answer_value_ = #{answerValue},
@@ -78,7 +78,7 @@
 					sort_ = #{item.sort},
 				</if>
 				<if test="item.isOver != null">
-					is_over_ = #{item.isOver},
+					is_over_ = #{item.isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 				</if>
 				<if test="item.answerValue != null">
 					answer_value_ = #{item.answerValue},

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

@@ -12,21 +12,21 @@
 		<result column="content_" property="content" />
 		<result column="type_" property="type" />
 		<result column="sort_" property="sort" />
-		<result column="is_require_" property="isRequire" />
+		<result column="is_require_" property="isRequire" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="desc_" property="desc" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
+		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<collection property="questionnaireQuestionItemList" ofType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem">
 			<result column="item_id_" property="id" />
 			<result column="item_questionnaire_topic_id_" property="questionnaireTopicId" />
 			<result column="item_questionnaire_question_id_" property="questionnaireQuestionId" />
 			<result column="item_answer_value_" property="answerValue" />
 			<result column="item_sort_" property="sort" />
-			<result column="item_is_over_" property="isOver" />
+			<result column="item_is_over_" property="isOver" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 			<result column="item_create_time_" property="createTime" />
 			<result column="item_update_time_" property="updateTime" />
-			<result column="item_del_flag_" property="delFlag" />
+			<result column="item_del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		</collection>
 	</resultMap>
 	
@@ -43,7 +43,7 @@
 		FROM questionnaire_question qq
 		LEFT JOIN questionnaire_question_item qqi ON qq.id_ = qqi.questionnaire_question_id_
 		<where>
-			qq.del_flag_ = 0 AND qqi.del_flag_ = 0
+			qq.del_flag_ != 1 AND qqi.del_flag_ != 1
 			<if test="topicId != null">
 				AND qq.questionnaire_topic_id_ = #{topicId}
 			</if>
@@ -54,7 +54,7 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestion" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_question (questionnaire_topic_id_,content_,type_,sort_,is_require_,desc_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},NOW(),NOW())
+		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{desc},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -73,7 +73,7 @@
 			type_ = #{type},
 		</if>
 		<if test="isRequire != null">
-			is_require_ = #{isRequire},
+			is_require_ = #{isRequire,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="desc != null">
 			desc_ = #{desc},

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

@@ -9,11 +9,11 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.QuestionnaireTopic" id="QuestionnaireTopic">
 		<result column="id_" property="id" />
 		<result column="title_" property="title" />
-		<result column="status_" property="status" />
+		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="creator_id_" property="creatorId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
+		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -29,14 +29,14 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireTopic" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_topic (title_,status_,creator_id_,create_time_,update_time_)
-		VALUES(#{title},#{status},#{creatorId},NOW(),NOW())
+		VALUES(#{title},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{creatorId},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireTopic">
 		UPDATE questionnaire_topic <set>
 		<if test="status != null">
-			status_ = #{status},
+			status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="title != null">
 			title_ = #{title},
@@ -59,7 +59,7 @@
 				AND (id_ = #{search} OR title_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="status != null">
-				AND status_ = #{status}
+				AND status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
 	</sql>

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

@@ -72,6 +72,6 @@
 		SELECT COUNT(*) FROM questionnaire_user_result
 	</select>
     <select id="countByTopicId" resultType="java.lang.Integer">
-		SELECT * FROM questionnaire_user_result WHERE id_ = #{id}
+		SELECT COUNT(id_) FROM questionnaire_user_result WHERE questionnaire_topic_id_ = #{topicId}
 	</select>
 </mapper>

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

@@ -105,6 +105,9 @@
     </select>
     <sql id="queryPageSql">
         <where>
+            <if test="search != null and search != ''">
+                AND (sv.object_id_ = #{search} OR t.id_ = #{search} OR s.id_ = #{search} OR t.real_name_ LIKE CONCAT('%',#{search},'%') OR s.username_ LIKE CONCAT('%',#{search},'%'))
+            </if>
             <if test="teacher != null and teacher != ''">
                 AND (t.id_ = #{teacher} OR t.real_name_ LIKE CONCAT('%',#{teacher},'%'))
             </if>

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

@@ -238,6 +238,7 @@
         <result column="course_schedule_type_" property="courseScheduleType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="course_schedule_status_" property="courseScheduleStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="course_schedule_name_" property="courseScheduleName"/>
+        <result column="dispose_content_" property="disposeContent"/>
         <result column="teacher_name_" property="teacherName"/>
         <result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="organ_name_" property="organName"/>
@@ -349,7 +350,8 @@
         cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.type_ course_schedule_type_,
         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_,
-        ta.sign_in_time_,ta.sign_out_time_,ta.remark_,o.name_ organ_name_,t.job_nature_,ta.complaints_status_,ta.id_ teacher_attendance_id_
+        ta.sign_in_time_,ta.sign_out_time_,ta.remark_,o.name_ organ_name_,t.job_nature_,
+        ta.complaints_status_,ta.id_ teacher_attendance_id_,ta.dispose_content_
         FROM course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = csts.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_

mec-web/src/main/java/com/ym/mec/web/controller/QuestionnaireTopicController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.QuestionnaireTopic;
+import com.ym.mec.biz.dal.page.QuestionnaireTopicQueryInfo;
 import com.ym.mec.biz.service.QuestionnaireTopicService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -62,7 +63,7 @@ public class QuestionnaireTopicController extends BaseController {
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/queryPage')")
-    public Object queryPage(QueryInfo queryInfo) {
+    public Object queryPage(QuestionnaireTopicQueryInfo queryInfo) {
         return succeed(questionnaireTopicService.queryPage(queryInfo));
     }
 }