Merge remote-tracking branch 'origin/master'

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

@@ -34,6 +34,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      */
     public static final String ATTENDANCE_RANGE = "attendance_range";
 
+    String ATTENDANCE_RANGE_VIP = "attendance_range_vip";
+
     /**
      * 学生允许请假的时间，为开课前{}小时
      */

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

@@ -186,6 +186,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 
         //是否在范围内
         boolean isInScore = true;
+        String teacherAttendanceMemo = null;
         if (Objects.nonNull(school)) {
             if (StringUtils.isBlank(school.getLongitudeLatitude())) {
                 if (studentAttendanceInfos.getUpdate().equals(YesOrNoEnum.YES.getCode())) {
@@ -193,12 +194,13 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                     schoolDao.update(school);
                 }
             } else {
-                SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE);
+                SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE_VIP);
                 double attendanceRange = Double.valueOf(sysConfig.getParanValue());
                 double distance = MapUtil.distance(studentAttendanceInfos.getSignInLongitudeLatitude(),
                         school.getLongitudeLatitude());
                 if (distance > attendanceRange) {
                     isInScore = false;
+                    teacherAttendanceMemo = "打卡地点距离教学点" + distance + "米";
                 }
             }
         }
@@ -214,10 +216,11 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
         }
 
         teacherAttendance.setSignInTime(courseSchedule.getStartClassTime());
-        teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
+        teacherAttendance.setSignInStatus(isInScore?YesOrNoEnum.YES:YesOrNoEnum.NO);
         teacherAttendance.setSignOutTime(courseSchedule.getEndClassTime());
-        teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
+        teacherAttendance.setSignOutStatus(isInScore?YesOrNoEnum.YES:YesOrNoEnum.NO);
         teacherAttendance.setCurrentClassTimes(classTimes + 1);
+        teacherAttendance.setRemark(teacherAttendanceMemo);
         if (Objects.nonNull(teacherAttendance.getId())) {
             teacherAttendanceDao.update(teacherAttendance);
         } else {

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

@@ -34,7 +34,7 @@
         <!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
             AS ID FROM DUAL </selectKey> -->
         INSERT INTO organization_course_duration_settings
-        (id_,organ_id_,course_type_,duration,create_time_,update_time_)
+        (id_,organ_id_,course_type_,duration_,create_time_,update_time_)
         VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{duration},now(),now())
     </insert>
 

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

@@ -597,7 +597,7 @@
                SUM(IF(g.type_ != 'INSTRUMENT', so.expect_amount_, 0)) teachingFee
         FROM student_payment_order spo
                  LEFT JOIN sell_order so ON spo.id_ = so.order_id_
-                 LEFT JOIN goods g ON g.id_ = so.goods_id_
+                 LEFT JOIN goods g ON IF(so.parent_goods_id_ IS NOT NULL,g.id_ = so.parent_goods_id_,g.id_ = so.goods_id_)
         WHERE spo.id_ = #{orderId}
     </select>
 </mapper>