sql优化

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CooperationOrganDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import java.util.List;
 import java.util.Map;
 
+import com.ym.mec.biz.dal.dto.CooperationOrganDto;
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.biz.dal.dto.OrganFullJobResourceNumDto;
@@ -90,4 +91,7 @@ public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan>
     List<Map<Integer, String>> findFirstMusic();
 
     List<CooperationOrgan> queryByOrganIdAndEnable(@Param("organId") String organId, @Param("enable") Boolean enable);
+
+    //获取乐团关联的合作单位
+    List<CooperationOrganDto> queryByGroupIds(@Param("musicGroupIds") List<String> musicGroupIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStatisticsDao.java

@@ -22,7 +22,7 @@ public interface CourseScheduleStatisticsDao extends BaseDAO<Long, CourseSchedul
     void delWaitByCourseId(@Param("courseIdList") List<Long> courseIdList);
 
     //更新服务指标
-    void updateCourseService(@Param("courseIds") String courseIds, @Param("serviceFlag") int serviceFlag);
+    void updateCourseService(@Param("courseIds") List<Integer> courseIds, @Param("serviceFlag") int serviceFlag);
 
     void updateNum(@Param("courseScheduleId") Long courseScheduleId,
                    @Param("teacherId") Integer teacherId,

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

@@ -0,0 +1,55 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CooperationOrganDto {
+
+    private Integer id;
+
+    /**  */
+    private Integer educationUserId;
+
+    /**  */
+    private String realName;
+
+    private String musicGroupId;
+
+    /** 单位名称 */
+    @ApiModelProperty(value = "班级编号", required = false)
+    private String name;
+
+    /** 分部编号 */
+    @ApiModelProperty(value = "分部编号", required = false)
+    private Integer organId;
+
+    /** 联系人 */
+    @ApiModelProperty(value = "联系人", required = false)
+    private String linkman;
+
+    /**  */
+    @ApiModelProperty(value = "职位", required = false)
+    private String job;
+
+    /**  */
+    @ApiModelProperty(value = "手机号码", required = false)
+    private String mobileNo;
+
+    /**  */
+    @ApiModelProperty(value = "地址", required = false)
+    private String address;
+
+    @ApiModelProperty(value = "权属类型(OWN('自有'),COOPERATION('合作'),LEASE('租赁'))", required = false)
+    private CooperationOrgan.OwnershipType ownershipType;
+
+    @ApiModelProperty(value = "是否启用", required = false)
+    private Boolean isEnable;
+
+    @ApiModelProperty(value = "是否全职资源",required = false)
+    private Integer fullJobResource = 1;
+
+    @ApiModelProperty("合作单位logo")
+    private String logo;
+}

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

@@ -1,17 +1,23 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.StudentExtracurricularExercisesSituation;
+import lombok.Data;
 
 /**
  * @Author Joburgess
  * @Date 2020/4/10
  */
+@Data
 public class StudentExercisesSituationDto extends StudentExtracurricularExercisesSituation {
 
     private String studentName;
 
     private String organName;
 
+    private Integer organId;
+
+    private Integer teacherId;
+
     private String teacherName;
 
     private Integer existVipCourse;
@@ -23,68 +29,4 @@ public class StudentExercisesSituationDto extends StudentExtracurricularExercise
     private String educationalTeacherName;
 
     private String groupNames;
-
-    public Integer getEducationalTeacherId() {
-        return educationalTeacherId;
-    }
-
-    public void setEducationalTeacherId(Integer educationalTeacherId) {
-        this.educationalTeacherId = educationalTeacherId;
-    }
-
-    public String getEducationalTeacherName() {
-        return educationalTeacherName;
-    }
-
-    public void setEducationalTeacherName(String educationalTeacherName) {
-        this.educationalTeacherName = educationalTeacherName;
-    }
-
-    public Integer getExistPracticeCourse() {
-        return existPracticeCourse;
-    }
-
-    public void setExistPracticeCourse(Integer existPracticeCourse) {
-        this.existPracticeCourse = existPracticeCourse;
-    }
-
-    public Integer getExistVipCourse() {
-        return existVipCourse;
-    }
-
-    public void setExistVipCourse(Integer existVipCourse) {
-        this.existVipCourse = existVipCourse;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getOrganName() {
-        return organName;
-    }
-
-    public void setOrganName(String organName) {
-        this.organName = organName;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getGroupNames() {
-        return groupNames;
-    }
-
-    public void setGroupNames(String groupNames) {
-        this.groupNames = groupNames;
-    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/CooperationOrganService.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dao.CooperationOrganDao;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
@@ -10,6 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface CooperationOrganService extends BaseService<Integer, CooperationOrgan> {
+    CooperationOrganDao getDao();
 
     /**
      * 根据机构编号获取合作单位(教学点)列表

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

@@ -53,6 +53,10 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 	public BaseDAO<Integer, CooperationOrgan> getDAO() {
 		return cooperationOrganDao;
 	}
+	@Override
+	public CooperationOrganDao getDao() {
+		return cooperationOrganDao;
+	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)

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

@@ -13,12 +13,7 @@ import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.StandardEnum;
 import com.ym.mec.biz.dal.enums.TeacherRemindTypeEnum;
 import com.ym.mec.biz.dal.page.*;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.CourseScheduleService;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.StudentCourseHomeworkService;
-import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
-import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -83,7 +78,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
     private ClassGroupService classGroupService;
 
     @Autowired
-    private StudentCourseHomeworkService studentCourseHomeworkService;
+    private CooperationOrganService cooperationOrganService;
 
     @Autowired
     private ExtracurricularExercisesDao extracurricularExercisesDao;
@@ -118,6 +113,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 		PageInfo<StudentExercisesSituationDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
+		if (StringUtils.isNotEmpty(queryInfo.getOrganId())){
+
+		}
 
 		List<StudentExercisesSituationDto> dataList = null;
 		int count = studentExtracurricularExercisesSituationDao.countExercisesSituations(params);
@@ -125,27 +123,37 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = studentExtracurricularExercisesSituationDao.findExercisesSituations(params);
-			List<Integer> studentIds = dataList.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toList());
+			List<Integer> organIds = dataList.stream().map(StudentExercisesSituationDto::getOrganId).distinct().collect(Collectors.toList());
+			List<String> musicGroupIds = dataList.stream().map(StudentExercisesSituationDto::getMusicGroupId).distinct().collect(Collectors.toList());
+			List<Integer> studentIds = dataList.stream().map(StudentExercisesSituationDto::getStudentId).collect(Collectors.toList());
+			List<Integer> teacherIds = dataList.stream().map(StudentExercisesSituationDto::getTeacherId).distinct().collect(Collectors.toList());
 			List<Map<Integer, Long>> studentVipCoursesMaps = courseScheduleDao.countStudentVipCoursesWithDate(studentIds, queryInfo.getMonday(), queryInfo.getSunday(), GroupType.VIP);
 			Map<Integer, Long> studentVipCourseMap = MapUtil.convertIntegerMap(studentVipCoursesMaps);
 
 			List<Map<Integer, Long>> studentPracticeCoursesMaps = courseScheduleDao.countStudentPayPracticeCoursesWithDate(studentIds, queryInfo.getMonday(), queryInfo.getSunday());
 			Map<Integer, Long> studentPracticeCourseMap = MapUtil.convertIntegerMap(studentPracticeCoursesMaps);
-
-			/*List<StudentEduTeacherDto> studentEducationalTeachers = classGroupStudentMapperDao.getStudentEducationalTeachers(studentIds);
-			Map<Integer, List<StudentEduTeacherDto>> studentEduTeachersMap = studentEducationalTeachers.stream().collect(Collectors.groupingBy(StudentEduTeacherDto::getStudentId));
-*/
-			/*List<UserGroupDto> allUserGroups = studentRegistrationDao.getUserGroups(studentIds);
-			Map<Integer, List<UserGroupDto>> userGroupsMap = new HashMap<>();
-			if(!CollectionUtils.isEmpty(allUserGroups)){
-				userGroupsMap = allUserGroups.stream().collect(Collectors.groupingBy(UserGroupDto::getUserId));
-			}*/
-
+			Map<Integer, String> teacherNameMap = MapUtil.convertMybatisMap(teacherDao.queryNameByIdList(teacherIds));
+
+			Map<Integer, String> organNameMap = this.getMap("organization", "id_", "name_", organIds, queryInfo.getTenantId(), Integer.class, String.class);
+			Map<String, String> groupNameMap = this.getMap("music_group", "id_", "name_", musicGroupIds, queryInfo.getTenantId(), String.class, String.class);
+			List<CooperationOrganDto> cooperationOrgans = cooperationOrganService.getDao().queryByGroupIds(musicGroupIds);
+			Map<String, CooperationOrganDto> cooperationMap = new HashMap<>();
+			if(!CollectionUtils.isEmpty(cooperationOrgans)){
+				cooperationMap = cooperationOrgans.stream().collect(Collectors.groupingBy(e -> e.getMusicGroupId(),Collectors.collectingAndThen(Collectors.toList(),v->v.get(0))));
+			}
 			for (StudentExercisesSituationDto exercisesSituationDto : dataList) {
 				Long vipCourses=studentVipCourseMap.get(exercisesSituationDto.getStudentId());
 				exercisesSituationDto.setExistVipCourse(Objects.isNull(vipCourses)?0:vipCourses.intValue());
 				Long practiceCourses=studentPracticeCourseMap.get(exercisesSituationDto.getStudentId());
 				exercisesSituationDto.setExistPracticeCourse(Objects.isNull(practiceCourses)?0:practiceCourses.intValue());
+				exercisesSituationDto.setOrganName(organNameMap.get(exercisesSituationDto.getOrganId()));
+				exercisesSituationDto.setTeacherName(teacherNameMap.get(exercisesSituationDto.getTeacherId()));
+				exercisesSituationDto.setGroupNames(groupNameMap.get(exercisesSituationDto.getMusicGroupId()));
+				CooperationOrganDto cooperationOrganDto = cooperationMap.get(exercisesSituationDto.getMusicGroupId());
+				if(Objects.nonNull(cooperationOrganDto)){
+					exercisesSituationDto.setEducationalTeacherId(cooperationOrganDto.getEducationUserId());
+					exercisesSituationDto.setEducationalTeacherName(cooperationOrganDto.getRealName());
+				}
 //				exercisesSituationDto.setExpectExercisesNum((int) until+1);
 				/*List<UserGroupDto> userGroupDtos = userGroupsMap.get(exercisesSituationDto.getStudentId());
 				if(!CollectionUtils.isEmpty(userGroupDtos)){
@@ -604,8 +612,10 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 		studentExtracurricularExercisesSituationDao.batchInsert(situations);
 		String collect = situations.stream().map(e -> e.getCourseIds()).filter(e -> StringUtils.isNotEmpty(e)).distinct().collect(Collectors.joining(","));
 		if(StringUtils.isNotEmpty(collect)){
+			//转换成int数组
+			List<Integer> courseIds = Arrays.stream(collect.split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toList());
 			//更新课程服务指标
-			courseScheduleStatisticsDao.updateCourseService(collect,1);
+			courseScheduleStatisticsDao.updateCourseService(courseIds,1);
 		}
 	}
 
@@ -898,8 +908,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 //		studentExtracurricularExercisesSituationDao.batchDelete(collect1);
 		String collect = situations.stream().map(e -> e.getCourseIds()).filter(e -> StringUtils.isNotEmpty(e)).distinct().collect(Collectors.joining(","));
 		if(StringUtils.isNotEmpty(collect)){
+			List<Integer> courseIds = Arrays.stream(collect.split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toList());
 			//更新课程服务指标
-			courseScheduleStatisticsDao.updateCourseService(collect,0);
+			courseScheduleStatisticsDao.updateCourseService(courseIds,0);
 		}
 	}
 }

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

@@ -224,4 +224,31 @@
         WHERE FIND_IN_SET(organ_id_, #{organId})
           AND del_flag_ != 1
     </select>
+    <resultMap type="com.ym.mec.biz.dal.dto.CooperationOrganDto" id="CooperationOrganDto">
+        <result column="id_" property="id"/>
+        <result column="education_user_id_" property="educationUserId"/>
+        <result column="real_name_" property="realName"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="name_" property="name"/>
+        <result column="linkman_" property="linkman"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="job_" property="job"/>
+        <result column="mobile_no_" property="mobileNo"/>
+        <result column="address_" property="address"/>
+        <result column="is_enable_" property="isEnable"/>
+        <result column="ownership_type_" property="ownershipType"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="full_job_resource_" property="fullJobResource"/>
+        <result column="logo_" property="logo" />
+    </resultMap>
+    <select id="queryByGroupIds" resultMap="CooperationOrganDto">
+        select co.*,su.real_name_,mg.id_ music_group_id_ from music_group mg
+        left join cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
+        left join sys_user su ON su.id_ = co.education_user_id_
+        where mg.id_ IN
+        <foreach collection="musicGroupIds" open="(" close=")" item="musicGroupId">
+            #{musicGroupId}
+        </foreach>
+        group by mg.id_
+    </select>
 </mapper>

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

@@ -119,7 +119,11 @@
 		</foreach>
 	</update>
 	<update id="updateCourseService">
-		UPDATE course_schedule_statistics SET service_flag_ = #{serviceFlag} WHERE FIND_IN_SET(course_schedule_id_,#{courseIds})
+		UPDATE course_schedule_statistics SET service_flag_ = #{serviceFlag}
+		WHERE course_schedule_id_ IN
+		<foreach collection="courseIds" item="courseScheduleId" separator="," open="(" close=")">
+			#{courseScheduleId}
+		</foreach>
 	</update>
     <update id="updateNum">
 		update student_extracurricular_exercises_situation_

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

@@ -997,8 +997,8 @@
 		SELECT COUNT(DISTINCT c.id_) FROM (SELECT cs.id_ FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
-		WHERE ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime}
+		WHERE ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ BETWEEN #{startTime} AND CURDATE()
 		AND ((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL)
 		         AND ta.complaints_content_ IS NULL AND ta.dispose_content_ IS NULL)
 		AND (ta.sign_out_status_ IS NOT NULL OR ta.sign_in_status_ IS NOT NULL)

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

@@ -34,7 +34,9 @@
                extends="StudentExtracurricularExercisesSituation">
         <result column="student_name_" property="studentName"/>
         <result column="teacher_name_" property="teacherName"/>
+        <result column="teacher_id_" property="teacherId"/>
         <result column="organ_name_" property="organName"/>
+        <result column="organ_id_" property="organId"/>
         <result column="exist_vip_course_" property="existVipCourse"/>
         <result column="groupNames" property="groupNames" />
         <result column="educationalTeacherId" property="educationalTeacherId" />
@@ -268,46 +270,38 @@
 
     <select id="findExercisesSituations" resultMap="StudentExercisesSituationDto">
         SELECT
-        sees.id_ id_,
+        sees.id_,
         sees.music_group_id_,
-        mg.name_ groupNames,
-        co.education_user_id_ educationalTeacherId,
-        uu.real_name_ educationalTeacherName,
-        student_id_,
+        sees.student_id_,
         stu.username_ student_name_,
-        tea.real_name_ teacher_name_,
-        o.name_ organ_name_,
+        sees.teacher_id_,
+        stu.organ_id_,
         sees.monday_,
         sees.sunday_,
         sees.serve_type_,
         sees.course_ids_,
-        expect_exercises_num_ expect_exercises_num_,
-        actual_exercises_num_ actual_exercises_num_,
+        sees.expect_exercises_num_,
+        sees.actual_exercises_num_,
         <if test="submitStartDate==null or submitEndDate==null">
-            exercises_reply_num_ exercises_reply_num_,
-            exercises_message_num_ exercises_message_num_,
-            exercises_message_timely_num_ exercises_message_timely_num_,
-            last_submit_time_ last_submit_time_
+            sees.exercises_reply_num_,
+            sees.exercises_message_num_,
+            sees.exercises_message_timely_num_,
+            sees.last_submit_time_
         </if>
         <if test="submitStartDate!=null and submitEndDate!=null">
-            IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
-            #{submitEndDate},exercises_reply_num_,0) exercises_reply_num_,
-            IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
-            #{submitEndDate},exercises_message_num_,0) exercises_message_num_,
-            IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
-            #{submitEndDate},exercises_message_timely_num_,0) exercises_message_timely_num_,
-            IF(DATE_FORMAT(last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
-            #{submitEndDate},last_submit_time_, NULL) last_submit_time_
+            IF(DATE_FORMAT(sees.last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
+            #{submitEndDate},sees.exercises_reply_num_,0) exercises_reply_num_,
+            IF(DATE_FORMAT(sees.last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
+            #{submitEndDate},sees.exercises_message_num_,0) exercises_message_num_,
+            IF(DATE_FORMAT(sees.last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
+            #{submitEndDate},sees.exercises_message_timely_num_,0) exercises_message_timely_num_,
+            IF(DATE_FORMAT(sees.last_submit_time_, '%Y-%m-%d') BETWEEN #{submitStartDate} AND
+            #{submitEndDate},sees.last_submit_time_, NULL) last_submit_time_
         </if>
         FROM
         student_extracurricular_exercises_situation_ sees
-        left join music_group mg on mg.id_ = sees.music_group_id_
-        left join cooperation_organ co on co.id_ = mg.cooperation_organ_id_
-        left join sys_user uu on uu.id_ = co.education_user_id_
-        LEFT JOIN sys_user stu ON stu.id_=sees.student_id_
-        LEFT JOIN teacher t ON t.id_=sees.teacher_id_
-        LEFT JOIN sys_user tea ON tea.id_=sees.teacher_id_
-        LEFT JOIN organization o ON stu.organ_id_=o.id_
+        LEFT JOIN sys_user stu ON stu.id_ = sees.student_id_
+        LEFT JOIN teacher t ON t.id_ = sees.teacher_id_
         WHERE
         sees.monday_ &gt;= #{monday}
         AND sees.sunday_ &lt;= #{sunday} and sees.tenant_id_ = #{tenantId}
@@ -406,7 +400,7 @@
                 #{submitEndDate},exercises_message_timely_num_,0) &gt;= exercises_message_num_
             </if>
         </if>
-        ORDER BY student_id_
+        ORDER BY sees.student_id_
         <include refid="global.limit"/>
     </select>
 
@@ -418,8 +412,6 @@
         student_extracurricular_exercises_situation_ sees
         LEFT JOIN sys_user stu ON stu.id_=sees.student_id_
         LEFT JOIN teacher t ON t.id_=sees.teacher_id_
-        LEFT JOIN sys_user tea ON tea.id_=sees.teacher_id_
-        LEFT JOIN organization o ON stu.organ_id_=o.id_
         WHERE
         sees.monday_ &gt;= #{monday}
         AND sees.sunday_ &lt;= #{sunday} and sees.tenant_id_ = #{tenantId}