Merge branch 'master' of http://git.dayaedu.com/yonge/mec

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -48,7 +48,7 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_,link_url_,href_target_,order_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now,#{linkUrl},#{hrefTarget},#{order})
+		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->

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

@@ -1119,7 +1119,7 @@
 
     <resultMap id="IntegerAndIntegerListDto" type="com.ym.mec.biz.dal.dto.IntegerAndIntegerListDto">
         <result property="id" column="id_"/>
-        <collection property="ids" ofType="string" javaType="list">
+        <collection property="ids" ofType="int" javaType="list">
             <result column="relate_ids"/>
         </collection>
     </resultMap>
@@ -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-student/src/main/java/com/ym/mec/student/controller/SysMessageController.java

@@ -46,8 +46,8 @@ public class SysMessageController extends BaseController {
 		}
 		queryInfo.setUserId(sysUser.getId());
 		queryInfo.setType(MessageSendMode.PUSH.getCode());
-		PageInfo<SysMessage> pageInfo = sysMessageService.queryPage(queryInfo);
-		return succeed(pageInfo);
+		queryInfo.setStatus(2);
+		return succeed(sysMessageService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("一键已读")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMessageController.java

@@ -46,8 +46,8 @@ public class SysMessageController extends BaseController {
 		}
 		queryInfo.setUserId(sysUser.getId());
 		queryInfo.setType(3);
-		PageInfo<SysMessage> pageInfo = sysMessageService.queryPage(queryInfo);
-		return succeed(pageInfo);
+		queryInfo.setStatus(2);
+		return succeed(sysMessageService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("一键已读")

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();
 	}

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

@@ -160,7 +160,7 @@ public class CourseScheduleController extends BaseController {
     }
 
     @ApiOperation(value = "课程投诉审核")
-    @GetMapping(value = "/courseScheduleCommplaintAudit")
+    @PostMapping(value = "/courseScheduleCommplaintAudit")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseScheduleCommplaintAudit')")
 	public Object courseScheduleCommplaintAudit(Long id, Double teacherLiabilityRatio, Double studentLiabilityRatio, AuditStatusEnum status) {
 		scheduleService.courseScheduleCommplaintAudit(id, teacherLiabilityRatio, studentLiabilityRatio, status);