j

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

@@ -62,7 +62,7 @@
 				title_ = #{title},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="content != null">
 				content_ = #{content},

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -74,7 +74,7 @@
                 component_ = #{component},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="type != null">
                 type_ = #{type},

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -51,7 +51,7 @@
                 role_desc_ = #{roleDesc},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="organId != null">
                 organ_id_ = #{organId},

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -100,7 +100,7 @@
                 user_type_ = #{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="lockFlag != null">
                 lock_flag_ = #{lockFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},

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

@@ -129,6 +129,15 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	List<Date> getCourseScheduleDates(Date month);
 
 	/**
+	 * @describe 课程调整
+	 * @author Joburgess
+	 * @date 2019/11/7
+	 * @param newCourseSchedules: 课程计划列表
+	 * @return void
+	 */
+	void courseAdjust(List<CourseSchedule> newCourseSchedules);
+
+	/**
 	 * @Author: Joburgess
 	 * @Date: 2019/9/23
 	 * 课时调整

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

@@ -20,7 +20,7 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @return int
      * @describe 创建vip课教师课酬
      */
-    int createCourseScheduleTeacherVipSalary(VipGroup vipGroup,
+    void createCourseScheduleTeacherVipSalary(VipGroup vipGroup,
                                              List<CourseSchedule> vipCourseSchedules,
                                              BigDecimal onlineTeacherSalary,
                                              BigDecimal offlineTeacherSalary);

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

@@ -449,6 +449,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		return map;
 	}
 
+	@Override
+	public void courseAdjust(List<CourseSchedule> newCourseSchedules) {
+		checkNewCourseSchedules(newCourseSchedules);
+		classStartDateAdjust(newCourseSchedules);
+	}
+
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void classStartDateAdjust(List<CourseSchedule> newCourseSchedules) {
@@ -498,6 +504,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					VipGroup byCourseSchedule = vipGroupDao.findByCourseSchedule(newCourseSchedule.getId().intValue());
 					TeacherDefaultVipGroupSalary byTeacherAndCategory = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(newCourseSchedule.getActualTeacherId(), byCourseSchedule.getVipGroupCategoryId());
 					List<CourseSchedule> courseSchedules=new ArrayList<>();
+					courseSchedules.add(newCourseSchedule);
 					courseScheduleTeacherSalaryService.createCourseScheduleTeacherVipSalary(byCourseSchedule,
 							courseSchedules,
 							byTeacherAndCategory.getOnlineClassesSalary(),
@@ -578,6 +585,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		CourseSchedule courseSchedule1 = courseScheduleDao.get(courseScheduleId1);
 		CourseSchedule courseSchedule2 = courseScheduleDao.get(courseScheduleId2);
 
+		if(Objects.isNull(courseSchedule1)||Objects.isNull(courseSchedule2)){
+			throw new BizException("未找到对应课程");
+		}
+
 		//获取两个课程的主教、助教
 		List<Long> courseScheduleIds=new ArrayList<>();
 		courseScheduleIds.add(courseScheduleId1);

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

@@ -73,6 +73,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 							courseScheduleStudentPayment.setExpectPrice(
 									vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice().multiply(
 											new BigDecimal(vipGroupActivity.getAttribute1())
+													.divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP)
 									)
 							);
 							break;
@@ -98,6 +99,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 							courseScheduleStudentPayment.setExpectPrice(
 									vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice().multiply(
 											new BigDecimal(vipGroupActivity.getAttribute1())
+													.divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP)
 									)
 							);
 							break;

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

@@ -55,7 +55,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     }
 
     @Override
-    public int createCourseScheduleTeacherVipSalary(VipGroup vipGroup,
+    public void createCourseScheduleTeacherVipSalary(VipGroup vipGroup,
                                                     List<CourseSchedule> vipCourseSchedules,
                                                     BigDecimal onlineTeacherSalary,
                                                     BigDecimal offlineTeacherSalary) {
@@ -77,7 +77,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     .sorted(Comparator.comparing(CourseSchedule::getStartClassTime)).collect(Collectors.toList());
             for (int i = 0; i < courseSchedules.size(); i++) {
                 //创建教师课程薪水记录
-                CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
+                CourseScheduleTeacherSalary courseScheduleTeacherSalary = courseScheduleTeacherSalaryDao.queryByCourseScheduleIdAndUserId(courseSchedules.get(i).getId(),courseSchedules.get(i).getActualTeacherId());
+                if(Objects.isNull(courseScheduleTeacherSalary)){
+                    courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
+                }
                 courseScheduleTeacherSalary.setCourseScheduleId(courseSchedules.get(i).getId());
                 courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
                 courseScheduleTeacherSalary.setUserId(courseSchedules.get(i).getActualTeacherId().intValue());
@@ -103,10 +106,16 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                         courseScheduleTeacherSalary.setExpectSalary(feeInfo.get("offlineTeacherSalary"));
                     }
                 }
-                courseScheduleTeacherSalaries.add(courseScheduleTeacherSalary);
+                if(Objects.isNull(courseScheduleTeacherSalary.getId())){
+                    courseScheduleTeacherSalaries.add(courseScheduleTeacherSalary);
+                }else{
+                    courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
+                }
             }
         }
-        return courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
+        if(courseScheduleTeacherSalaries.size()>0){
+            courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
+        }
     }
 
     @Override
@@ -350,12 +359,26 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             //如果结算方式是教师默认课酬
             if (settlementType.equals(SalarySettlementTypeEnum.TEACHER_DEFAULT)) {
                 //课程时长与结算单位时长占比
-                BigDecimal classTimeDuty = new BigDecimal(duration).divide(new BigDecimal(30));
+                BigDecimal classTimeDuty = new BigDecimal(duration);
+                if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
+                    classTimeDuty=classTimeDuty.divide(new BigDecimal(45));
+                }else  if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)) {
+                    classTimeDuty=classTimeDuty.divide(new BigDecimal(40));
+                }else{
+                    classTimeDuty=classTimeDuty.divide(new BigDecimal(30));
+                }
                 BigDecimal teacherDefaultSalary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalaryWithTeacherId.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalaryWithTeacherId.getAssistantTeacher30MinSalary();
                 teacherSalary = teacherDefaultSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
             } else if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                 //课程时长与结算单位时长占比
-                BigDecimal classTimeDuty = new BigDecimal(duration).divide(new BigDecimal(90));
+                BigDecimal classTimeDuty = new BigDecimal(duration);
+                if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
+                    classTimeDuty=classTimeDuty.divide(new BigDecimal(45));
+                }else  if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)) {
+                    classTimeDuty=classTimeDuty.divide(new BigDecimal(40));
+                }else{
+                    classTimeDuty=classTimeDuty.divide(new BigDecimal(90));
+                }
                 BigDecimal teacherDefaultSalary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? teacherDefaultMusicGroupSalaryWithTeacherId.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryWithTeacherId.getAssistantTeacher90MinSalary();
                 teacherSalary = teacherDefaultSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
             }

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

@@ -201,6 +201,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 		studentAttendanceDao.insert(studentAttendance);
 		
 		ClassGroupStudentMapper classGroupStudentMapper = classGroupStudentMapperDao.query(courseSchedule.getClassGroupId(), userId);
+		if(Objects.isNull(classGroupStudentMapper)){
+			throw new BizException("您不在此课程对应班级上");
+		}
 		classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.LEAVE);
 		classGroupStudentMapperDao.update(classGroupStudentMapper);
 

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

@@ -114,7 +114,7 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 					list.add(his.getAfter());
 				}
 				// 课时调整
-				courseScheduleService.classStartDateAdjust(list);
+				courseScheduleService.courseAdjust(list);
 			}
 		}
 		//教师请假结果通知

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

@@ -639,7 +639,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					}
 
 					if(Objects.isNull(teacherOnlineSalary)){
-						if(Objects.isNull(teacherDefaultVipGroupSalary)){
+						if(Objects.isNull(teacherDefaultVipGroupSalary)||Objects.isNull(teacherDefaultVipGroupSalary.getOnlineClassesSalary())){
 							throw new BizException("请设置教师课酬");
 						}
 						teacherOnlineSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
@@ -666,7 +666,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 							&&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
 						teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
 					}
-					if(Objects.isNull(teacherOfflineSalary)){
+					if(Objects.isNull(teacherOfflineSalary)||Objects.isNull(Objects.isNull(teacherDefaultVipGroupSalary))){
 						if(Objects.isNull(teacherDefaultVipGroupSalary)){
 							throw new BizException("请设置教师课酬");
 						}
@@ -910,8 +910,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		Map surplusClassTimes=MapUtil.convertMybatisMap(vipGroupDao.countSurplusClassTimes(vipGroupId));
 		studentApplyRefunds.setExpectAmount(countVipGroupPredictFee(vipGroup,
 				vipGroup.getUserId(),
-				new BigDecimal(surplusClassTimes.get(TeachModeEnum.ONLINE.getCode()).toString()),
-				new BigDecimal(surplusClassTimes.get(TeachModeEnum.OFFLINE.getCode()).toString()),
+				new BigDecimal(Objects.isNull(surplusClassTimes.get(TeachModeEnum.ONLINE.getCode()))?"0":surplusClassTimes.get(TeachModeEnum.ONLINE.getCode()).toString()),
+				new BigDecimal(Objects.isNull(surplusClassTimes.get(TeachModeEnum.OFFLINE.getCode()))?"0":surplusClassTimes.get(TeachModeEnum.OFFLINE.getCode()).toString()),
 				true,
 				false).get("totalPrice"));
 		studentApplyRefunds.setStatus(AuditStatusEnum.ING);

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

@@ -45,7 +45,7 @@
                 del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="description != null">
                 description_ = #{description},

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

@@ -52,7 +52,7 @@
                 charge_type_id_ = #{chargeTypeId},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
         </set>
         WHERE id_ = #{id}

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

@@ -65,7 +65,7 @@
             <if test="name!=null">#{name},</if>
             <if test="studentNum!=null">#{studentNum},</if>
             <if test="createTime!=null">#{createTime},</if>
-            <if test="updateTime!=null">#{updateTime},</if>
+            <if test="updateTime!=null">NOW(),</if>
             <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
             <if test="expectStudentNum!=null">#{expectStudentNum},</if>
             <if test="totalClassTimes!=null">#{totalClassTimes},</if>
@@ -97,7 +97,7 @@
                 student_num_ = #{studentNum},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},

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

@@ -36,7 +36,7 @@
             AS ID FROM DUAL </selectKey> -->
         INSERT INTO class_group_teacher_mapper
         (id_,music_group_id_,class_group_id_,teacher_role_,user_id_,salary_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{classGroupId},#{teacherRole},#{userId},#{salary},#{createTime},#{updateTime})
+        VALUES(#{id},#{musicGroupId},#{classGroupId},#{teacherRole},#{userId},#{salary},#{createTime},NOW())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -56,7 +56,7 @@
                 salary_ = #{salary},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="teacherRole != null">
                 teacher_role_ = #{teacherRole},

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

@@ -51,7 +51,7 @@
                 linkman_ = #{linkman},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="mobileNo != null">
                 mobile_no_ = #{mobileNo},

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

@@ -86,7 +86,7 @@
 			expect_num_ = #{expectNum},
 		</if>
 		<if test="updateTime != null">
-		update_time_ = #{updateTime},
+		update_time_ = NOW(),
 		</if>
 		<if test="content != null">
 		content_ = #{content},

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

@@ -41,7 +41,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO course_schedule_history (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,teach_mode_,complaint_status_,type_,course_schedule_id_) VALUES(#{id},#{classGroupId},#{status},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},#{createTime},#{updateTime},#{teachMode},#{complaintStatus},#{type},#{courseScheduleId})
+		INSERT INTO course_schedule_history (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,teach_mode_,complaint_status_,type_,course_schedule_id_) VALUES(#{id},#{classGroupId},#{status},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},#{createTime},NOW(),#{teachMode},#{complaintStatus},#{type},#{courseScheduleId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -84,7 +84,7 @@ start_class_time_ = #{startClassTime},
 teacher_id_ = #{teacherId},
 </if>
 <if test="updateTime != null">
-update_time_ = #{updateTime},
+update_time_ = NOW(),
 </if>
 <if test="courseScheduleId != null">
 course_schedule_id_ = #{courseScheduleId},

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

@@ -145,7 +145,7 @@
                 teacher_id_ = #{teacherId},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="studentNum != null">
                 student_num_ = #{studentNum},

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

@@ -35,7 +35,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO course_schedule_student_payment (id_,course_schedule_id_,user_id_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_,class_group_id_) VALUES(#{id},#{courseScheduleId},#{userId},#{expectPrice},#{actualPrice},#{createTime},#{updateTime},#{settlementTime},#{classGroupId})
+		INSERT INTO course_schedule_student_payment (id_,course_schedule_id_,user_id_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_,class_group_id_) VALUES(#{id},#{courseScheduleId},#{userId},#{expectPrice},#{actualPrice},#{createTime},NOW(),#{settlementTime},#{classGroupId})
 	</insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
 		INSERT INTO course_schedule_student_payment (id_,course_schedule_id_,user_id_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_,class_group_id_)
@@ -59,7 +59,7 @@
 			course_schedule_id_ = #{courseScheduleId},
 			</if>
 			<if test="updateTime != null">
-			update_time_ = #{updateTime},
+			update_time_ = NOW(),
 			</if>
 			<if test="settlementTime != null">
 			settlement_time_ = #{settlementTime},

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

@@ -58,11 +58,8 @@
 			<if test="subsidy != null">
 			subsidy_ = #{subsidy},
 			</if>
-			<if test="id != null">
-			id_ = #{id},
-			</if>
 			<if test="expectSalary != null">
-			expect_salary_ = #{expectSalary},
+				expect_salary_ = #{expectSalary},
 			</if>
 			<if test="courseScheduleId != null">
 			course_schedule_id_ = #{courseScheduleId},
@@ -74,14 +71,11 @@
 			teacher_role_ = #{teacherRole},
 			</if>
 			<if test="updateTime != null">
-			update_time_ = #{updateTime},
+			update_time_ = now(),
 			</if>
 			<if test="actualSalary != null">
 			actual_salary_ = #{actualSalary},
 			</if>
-			<if test="createTime != null">
-			create_time_ = #{createTime},
-			</if>
 			<if test="classGroupId != null">
 			class_group_id_ = #{classGroupId},
 			</if>

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

@@ -80,7 +80,7 @@
                 user_id_ = #{userId},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="singleClassMinutes != null">
                 single_class_minutes_ = #{singleClassMinutes},
@@ -181,6 +181,7 @@
             </if>
             <if test="startTime!=null and endTime==null">
                 AND CONCAT(dgcp.course_date_,' ',dgcp.start_time_)&gt;=DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%S')
+                AND dgcp.course_date_=DATE_FORMAT(#{startTime},'%Y-%m-%d')
             </if>
             <if test="startTime!=null and endTime!=null">
                 AND (CONCAT(dgcp.course_date_,' ',dgcp.start_time_) BETWEEN DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%S') AND DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%S'))

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

@@ -109,7 +109,7 @@
                 certificate_type_ = #{certificateType},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="educationBackground != null">
                 education_background_ = #{educationBackground},

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

@@ -53,7 +53,7 @@
                 order_no_ = #{orderNo},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="img != null">
                 img_ = #{img},

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

@@ -100,7 +100,7 @@
                 brief_ = #{brief},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="discountPrice != null">
                 discount_price_ = #{discountPrice},

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

@@ -46,7 +46,7 @@
 				id_ = #{id},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="marketPrice != null">
 				market_price_ = #{marketPrice},

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

@@ -80,7 +80,7 @@
 				coupon_amount_ = #{couponAmount},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="expressCompanyCode != null">
 				express_company_code_ = #{expressCompanyCode},

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

@@ -79,7 +79,7 @@
 				payment_business_channel_ = #{paymentBusinessChannel},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="goodsOrderId != null">
 				goods_order_id_ = #{goodsOrderId},

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

@@ -31,7 +31,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO hot_words_label (id_,name_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{createTime},#{updateTime},#{delFlag})
+		INSERT INTO hot_words_label (id_,name_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{createTime},NOW(),#{delFlag})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -44,7 +44,7 @@ del_flag_ = #{delFlag},
 id_ = #{id},
 </if>
 <if test="updateTime != null">
-update_time_ = #{updateTime},
+update_time_ = NOW(),
 </if>
 <if test="name != null">
 name_ = #{name},

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

@@ -48,7 +48,7 @@
                 remark_ = #{remark},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="name != null">
                 name_ = #{name},

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

@@ -105,7 +105,7 @@
 				cooperation_organ_id_ = #{cooperationOrganId},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="enlightenmentCourseTime != null">
 				enlightenment_course_time_ = #{enlightenmentCourseTime},

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

@@ -52,7 +52,7 @@
                 payment_month_ = #{paymentMonth},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},

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

@@ -45,7 +45,7 @@
 		UPDATE music_group_payment_entities
 		<set>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="amount != null">
 				amount_ = #{amount},

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

@@ -45,7 +45,7 @@
                 purchase_num_ = #{purchaseNum},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},

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

@@ -49,7 +49,7 @@
                 subject_id_ = #{subjectId},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="courseFee != null">
                 course_fee_ = #{courseFee},

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

@@ -61,7 +61,7 @@
                 goods_id_list_ = #{goodsIdList},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="type != null">
                 type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},

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

@@ -70,7 +70,7 @@
                 #{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="depositFee != null">
                 deposit_fee_ = #{depositFee},
@@ -94,7 +94,7 @@
                 apply_student_num_ = #{applyStudentNum},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="version != null">
                 version = version+1,

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

@@ -48,7 +48,7 @@
                 area_id_ = #{areaId},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="name != null">
                 name_ = #{name},

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

@@ -55,7 +55,7 @@
                 user_id_ = #{userId},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="contactPhone != null">
                 contact_phone_ = #{contactPhone},

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

@@ -65,7 +65,7 @@
                 expect_amount_ = #{expectAmount},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="origPaymentOrderId != null">
                 orig_payment_order_id_ = #{origPaymentOrderId},

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

@@ -80,7 +80,7 @@
 			course_homework_id_ = #{courseHomeworkId},
 			</if>
 			<if test="updateTime != null">
-			update_time_ = #{updateTime},
+			update_time_ = NOW(),
 			</if>
 			<if test="score != null">
 			score_ = #{score},

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

@@ -78,7 +78,7 @@
                 user_type_ = #{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="lockFlag != null">
                 lock_flag_ = #{lockFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},

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

@@ -52,7 +52,7 @@
                 goods_id_list_ = #{goodsIdList},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="paymentOrderId != null">
                 payment_order_id_ = #{paymentOrderId},

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

@@ -106,7 +106,7 @@
                 payment_account_no_ = #{paymentAccountNo},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="paymentBusinessChannel != null">
                 payment_business_channel_ = #{paymentBusinessChannel},

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

@@ -125,7 +125,7 @@
                 #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="createTime!=null">#{createTime},</if>
-            <if test="updateTime!=null">#{updateTime},</if>
+            <if test="updateTime!=null">NOW(),</if>
         </trim>
     </insert>
 
@@ -167,7 +167,7 @@
                 parents_name_ = #{parentsName},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="parentsCompany != null">
                 parents_company_ = #{parentsCompany},

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

@@ -46,7 +46,7 @@
                 subject_id_ = #{subjectId},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="goodsCategoryId != null">
                 goods_category_id_ = #{goodsCategoryId},

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

@@ -47,7 +47,7 @@
                 code_ = #{code},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="name != null">
                 name_ = #{name},

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

@@ -52,7 +52,7 @@
                 code_ = #{code},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="name != null">
                 name_ = #{name},

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

@@ -72,7 +72,7 @@
                 comment_ = #{comment},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="amount != null">
                 amount_ = #{amount},

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

@@ -50,7 +50,7 @@
                 user_id_ = #{userId},
             </if>
             <if test="updateTime != null">
-                update_time = #{updateTime},
+                update_time = NOW(),
             </if>
             <if test="frozenAmount != null">
                 frozen_amount_ = #{frozenAmount},

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

@@ -57,7 +57,7 @@
 				user_id_ = #{userId},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="courseScheduleType != null">
 				course_schedule_type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},

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

@@ -53,7 +53,7 @@
                 online_classes_salary_ = #{onlineClassesSalary},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="offlineClassesSalary != null">
                 offline_classes_salary_ = #{offlineClassesSalary},

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

@@ -40,7 +40,7 @@
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_leave_record
 		(id_,user_id_,days_,leave_category_id_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_)
-		VALUES(#{id},#{userId},#{days},#{leaveCategoryId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},#{updateTime},#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId})
+		VALUES(#{id},#{userId},#{days},#{leaveCategoryId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},NOW(),#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -81,7 +81,7 @@
 				wf_process_id_ = #{wfProcessId},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="leaveCategoryId != null">
 				leave_category_id_ = #{leaveCategoryId},

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

@@ -118,7 +118,7 @@
                 is_probation_period_ = #{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="educationBackground != null">
                 education_background_ = #{educationBackground},
@@ -169,7 +169,7 @@
                 user_type_ = #{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="lockFlag != null">
                 lock_flag_ = #{lockFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},

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

@@ -92,7 +92,7 @@
 			vip_group_category_id_list_ = #{vipGroupCategoryIdList},
 			</if>
 			<if test="updateTime != null">
-			update_time_ = #{updateTime},
+			update_time_ = NOW(),
 			</if>
 			<if test="description != null">
 			description_ = #{description},

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

@@ -43,7 +43,7 @@
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO vip_group_category
 		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_)
-		VALUES(#{id},#{name},#{delFlag},#{createTime},#{updateTime},#{singleClassMinutes},#{studentNum})
+		VALUES(#{id},#{name},#{delFlag},#{createTime},NOW(),#{singleClassMinutes},#{studentNum})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -60,7 +60,7 @@
 				id_ = #{id},
 			</if>
 			<if test="updateTime != null">
-				update_time_ = #{updateTime},
+				update_time_ = NOW(),
 			</if>
 			<if test="singleClassMinutes != null">
 				single_class_minutes_ = #{singleClassMinutes},

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

@@ -59,7 +59,7 @@ id_ = #{id},
 min_class_times_ = #{minClassTimes},
 </if>
 <if test="updateTime != null">
-update_time_ = #{updateTime},
+update_time_ = NOW(),
 </if>
 <if test="month != null">
 month_ = #{month},

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

@@ -42,7 +42,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_default_classes_unit_price_ (id_,organ_id_,vip_group_category_id_,online_classes_unit_price_,offline_classes_unit_price_,create_time_,update_time_) VALUES(#{id},#{organId},#{vipGroupCategoryId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{createTime},#{updateTime})
+		INSERT INTO vip_group_default_classes_unit_price_ (id_,organ_id_,vip_group_category_id_,online_classes_unit_price_,offline_classes_unit_price_,create_time_,update_time_) VALUES(#{id},#{organId},#{vipGroupCategoryId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{createTime},NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -61,7 +61,7 @@ offline_classes_unit_price_ = #{offlineClassesUnitPrice},
 online_classes_unit_price_ = #{onlineClassesUnitPrice},
 </if>
 <if test="updateTime != null">
-update_time_ = #{updateTime},
+update_time_ = NOW(),
 </if>
 <if test="vipGroupCategoryId != null">
 vip_group_category_id_ = #{vipGroupCategoryId},
@@ -88,7 +88,7 @@ create_time_ = #{createTime},
 			online_classes_unit_price_ = #{onlineClassesUnitPrice},
 		</if>
 		<if test="updateTime != null">
-			update_time_ = #{updateTime},
+			update_time_ = NOW(),
 		</if>
 		<if test="vipGroupCategoryId != null">
 			vip_group_category_id_ = #{vipGroupCategoryId},

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

@@ -193,7 +193,7 @@
                 online_classes_num_ = #{onlineClassesNum},
             </if>
             <if test="updateTime != null">
-                update_time_ = #{updateTime},
+                update_time_ = NOW(),
             </if>
             <if test="singleClassMinutes != null">
                 single_class_minutes_ = #{singleClassMinutes},

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

@@ -85,7 +85,7 @@ public class CourseScheduleController {
         }
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(classDateAdjustDto);
-        scheduleService.classStartDateAdjust(courseSchedules);
+        scheduleService.courseAdjust(courseSchedules);
         return BaseResponse.success(null);
     }
 

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

@@ -108,7 +108,7 @@ public class TeacherCourseScheduleController extends BaseController {
         }
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(classDateAdjustDto);
-        scheduleService.classStartDateAdjust(courseSchedules);
+        scheduleService.courseAdjust(courseSchedules);
         return succeed();
     }
 

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

@@ -123,7 +123,7 @@ public class CourseScheduleController extends BaseController {
     public Object classStartDateAdjust(CourseSchedule courseSchedule){
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(courseSchedule);
-        scheduleService.classStartDateAdjust(courseSchedules);
+        scheduleService.courseAdjust(courseSchedules);
         return succeed();
     }
 
@@ -131,7 +131,7 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchClassStartDateAdjust')")
     @PostMapping(value = "/batchClassStartDateAdjust",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object batchClassStartDateAdjust(List<CourseSchedule> courseSchedules){
-        scheduleService.classStartDateAdjust(courseSchedules);
+        scheduleService.courseAdjust(courseSchedules);
         return succeed();
     }
 

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

@@ -162,7 +162,7 @@ public class VipGroupManageController extends BaseController {
         }
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(classDateAdjustDto);
-        scheduleService.classStartDateAdjust(courseSchedules);
+        scheduleService.courseAdjust(courseSchedules);
         return succeed();
     }