j

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

@@ -277,6 +277,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         List<CourseSchedule> yesterdayCourseSchedules = courseScheduleDao.findCourseScheduleWithDate(yesterday);
         //课程编号列表
         List<Long> courseScheduleIds = yesterdayCourseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(courseScheduleIds)){
+            return;
+        }
         //获取课程对应教学点补贴
         List<Map<Integer, BigDecimal>> courseSubsidyByCourses = courseScheduleTeacherSalaryDao.findCourseSubsidyByCourses(courseScheduleIds);
         Map<Integer, BigDecimal> courseSubsidyMap = MapUtil.convertMybatisMap(courseSubsidyByCourses);

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

@@ -45,7 +45,7 @@
 		UPDATE course_schedule_complaints
 		<set>
 			<if test="status != null">
-			status_ = #{status, typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"},
+			status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="wfOrderId != null">
 			wf_order_id_ = #{wfOrderId},

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

@@ -1175,7 +1175,7 @@
         FROM
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
-        WHERE cs.class_date_=DATE_FORMAT(#{date},'%Y-%m-%d %H:%i:%s')
+        WHERE cs.class_date_=DATE_FORMAT(#{date},'%Y-%m-%d')
         AND cs.type_!='VIP'
     </select>
     <select id="findByClassGroup" resultMap="CourseSchedule">

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

@@ -460,14 +460,14 @@
         </if>
         GROUP BY t.id_
     </select>
-    <select id="findOrganTeacherBySubject" resultType="com.ym.mec.biz.dal.entity.Teacher">
+    <select id="findOrganTeacherBySubject" resultMap="Teacher">
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1
         <if test="organId != null">
             AND t.organ_id_ = #{organId}
         </if>
         <if test="subjectId != null">
-            AND FIND_IN_SET(#{subjectId},t.subjectId)
+            AND FIND_IN_SET(#{subjectId},t.subject_id_)
         </if>
     </select>
 

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -1,21 +1,19 @@
 package com.ym.mec.common.service.impl;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.base.Strings;
+import com.ym.mec.common.redis.service.RedisCache;
+import com.ym.mec.common.service.IdGeneratorService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 
-import com.google.common.base.Strings;
-import com.ym.mec.common.redis.service.RedisCache;
-import com.ym.mec.common.service.IdGeneratorService;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 @Service
 public class RedisIdGeneratorService implements IdGeneratorService {

mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java

@@ -962,7 +962,7 @@ public class DateUtil {
 	 */
 	public static Date addDays1(Date date,int days) {
 		Calendar cal = Calendar.getInstance();
-		cal.setTime(getWeekMondayWithDate(date));
+		cal.setTime(date);
 		cal.add(Calendar.DATE, days);
 		return cal.getTime();
 	}