update

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

@@ -579,4 +579,6 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	List<Integer> getTodayHasCourseTeacherIds();
 
     void deletePreCourse(String musicGroupId);
+
+	void batchUpdateSalary(@Param("courseScheduleTeacherSalaries") List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
 }

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

@@ -246,9 +246,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
         //试用期课酬规则
         String configValue2 = sysTenantConfigService.getTenantConfigValue(SysConfigService.PROBATION_TEACHER_SALARY,tenantId);
-        Integer probationTeacherSalary = 100;
+        double probationTeacherSalary = 100;
         if(StringUtils.isNotEmpty(configValue2)){
-            probationTeacherSalary = Integer.parseInt(configValue2);
+            probationTeacherSalary = Double.parseDouble(configValue2);
         }
 
         for (int i = 0; i < someDayAgoTeacherCourseSalaryNoSettlement.size(); i++) {
@@ -326,7 +326,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             courseScheduleTeacherSalary.setBelongToDaya(false);
         }
         if(someDayAgoTeacherCourseSalaryNoSettlement != null && someDayAgoTeacherCourseSalaryNoSettlement.size() > 0){
-            courseScheduleTeacherSalaryDao.batchUpdate(someDayAgoTeacherCourseSalaryNoSettlement);
+            courseScheduleTeacherSalaryDao.batchUpdateSalary(someDayAgoTeacherCourseSalaryNoSettlement);
         }
     }
 
@@ -354,9 +354,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
         //试用期课酬规则
         String configValue2 = sysTenantConfigService.getTenantConfigValue(SysConfigService.PROBATION_TEACHER_SALARY,tenantId);
-        Integer probationTeacherSalary = 100;
+        double probationTeacherSalary = 100;
         if(StringUtils.isNotEmpty(configValue2)){
-            probationTeacherSalary = Integer.parseInt(configValue2);
+            probationTeacherSalary = Double.parseDouble(configValue2);
         }
         //获取未结算课程编号列表
         List<Long> courseScheduleIds = someDayAgoTeacherCourseSalaryNoSettlement.stream().map(CourseScheduleTeacherSalary::getCourseScheduleId).collect(Collectors.toList());
@@ -460,17 +460,19 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             courseScheduleTeacherSalary.setBelongToDaya(false);
         }
         if(someDayAgoTeacherCourseSalaryNoSettlement.size() > 0){
-            courseScheduleTeacherSalaryDao.batchUpdate(someDayAgoTeacherCourseSalaryNoSettlement);
+            courseScheduleTeacherSalaryDao.batchUpdateSalary(someDayAgoTeacherCourseSalaryNoSettlement);
         }
     }
 
     Boolean isTrail(Teacher teacher,Date classDate){
         //判断课程是否在试用期内
         boolean trail = false;
-        if(Objects.nonNull(teacher)&&Objects.nonNull(teacher.getEntryDate())&&classDate.compareTo(teacher.getEntryDate())>=0){
+        if(Objects.nonNull(teacher) && Objects.nonNull(teacher.getEntryDate())
+                && classDate.compareTo(teacher.getEntryDate()) >= 0){
             trail = true;
         }
-        if(Objects.nonNull(teacher)&&Objects.nonNull(teacher.getFormalStaffDate())&&classDate.compareTo(teacher.getFormalStaffDate())>=0){
+        if(Objects.nonNull(teacher) && Objects.nonNull(teacher.getFormalStaffDate())
+                && classDate.compareTo(teacher.getFormalStaffDate())>=0){
             trail = false;
         }
         return trail;
@@ -658,7 +660,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         if(cutSalaryUnit.equals("1")){
             return new BigDecimal(cutSalary);
         }else {
-            return teacherSalary.multiply(new BigDecimal(Integer.parseInt(cutSalary)/100));
+            return teacherSalary.multiply(new BigDecimal(cutSalary).divide(new BigDecimal(100)));
         }
     }
 
@@ -696,9 +698,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         String attendanceRange = sysTenantConfigService.getTenantConfigValue(SysConfigService.ATTENDANCE_RANGE,tenantId);
           //试用期课酬规则
         String configValue2 = sysTenantConfigService.getTenantConfigValue(SysConfigService.PROBATION_TEACHER_SALARY,tenantId);
-        Integer probationTeacherSalary = 100;
+        double probationTeacherSalary = 100;
         if(StringUtils.isNotEmpty(configValue2)){
-            probationTeacherSalary = Integer.parseInt(configValue2);
+            probationTeacherSalary = Double.parseDouble(configValue2);
         }
 
         //教师签到记录
@@ -783,7 +785,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                         signInRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignInLongitudeLatitude(),attendanceRange);
                     }
                     Boolean signOutRange = false;
-                    if(teacherAttendance != null || StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
+                    if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
                         signOutRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignOutLongitudeLatitude(),attendanceRange);
                     }
                     if(!signInRange){
@@ -819,7 +821,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             courseScheduleTeacherSalary.setSettlementTime(now);
         }
         if(courseScheduleTeacherSalaries != null && courseScheduleTeacherSalaries.size() > 0){
-            courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
+            courseScheduleTeacherSalaryDao.batchUpdateSalary(courseScheduleTeacherSalaries);
         }
     }
 

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

@@ -536,8 +536,45 @@
     <update id="updateEnableChangeSalaryByClassGroup">
 		UPDATE course_schedule_teacher_salary SET enable_change_salary_ = #{enableChangeSalary} WHERE class_group_id_=#{classGroupId}
 	</update>
+	<update id="batchUpdateSalary">
+		<foreach collection="courseScheduleTeacherSalaries" item="bean" separator=";">
+			UPDATE course_schedule_teacher_salary
+			<set>
+				<if test="bean.expectSalary != null">
+					expect_salary_ = #{bean.expectSalary},
+				</if>
+				<if test="bean.settlementTime != null">
+					settlement_time_ = #{bean.settlementTime},
+				</if>
+				<if test="bean.updateTime != null">
+					update_time_ = now(),
+				</if>
+				<if test="bean.actualSalary != null">
+					actual_salary_ = #{bean.actualSalary},
+				</if>
+				<if test="bean.reduceSalary != null">
+					reduce_salary = #{bean.reduceSalary},
+				</if>
+				<if test="bean.confirmStatus != null">
+					confirm_status_ = #{bean.confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+				</if>
+				<if test="bean.memo != null">
+					memo_ = #{bean.memo},
+				</if>
+				<if test="bean.deductionReason != null">
+					deduction_reason_ = #{bean.deductionReason},
+				</if>
+				<if test="bean.belongToDaya != null">
+					belong_to_daya_ = #{bean.belongToDaya},
+				</if>
+				<if test="bean.enableChangeSalary != null">
+					enable_change_salary_ = #{bean.enableChangeSalary},
+				</if>
+			</set> WHERE id_ = #{bean.id}
+		</foreach>
+	</update>
 
-    <select id="findCourseScheduleTeacherSalaryByMusicGroupId" resultMap="CourseScheduleTeacherSalary">
+	<select id="findCourseScheduleTeacherSalaryByMusicGroupId" resultMap="CourseScheduleTeacherSalary">
 		SELECT * FROM course_schedule_teacher_salary WHERE music_group_id_=#{musicGroupId} AND group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	</select>
 	<select id="countActualAmount" resultType="java.util.Map">

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

@@ -168,18 +168,6 @@ public class VipGroupActivityController extends BaseController {
         activityQueryDto.setOrganId(student.getOrganId().toString());
         activityQueryDto.setEnable(true);
         List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.findByVipGroupCategory(activityQueryDto);
-
-//        SysConfig doubleElevenIdConfig = sysConfigService.findByParamName(SysConfigService.VIP_SPECIAL_ACTIVITY_IDS);
-//        if(Objects.nonNull(doubleElevenIdConfig)&&StringUtils.isNotBlank(doubleElevenIdConfig.getParanValue())){
-//            Set<Integer> activityIds = Arrays.stream(doubleElevenIdConfig.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toSet());
-//            Iterator<VipGroupActivity> iterator = vipGroupActivities.iterator();
-//            while(iterator.hasNext()){
-//                VipGroupActivity vipGroupActivity = iterator.next();
-//                if(activityIds.contains(vipGroupActivity.getId())){
-//                    iterator.remove();
-//                }
-//            }
-//        }
         return succeed(vipGroupActivities);
     }