Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentRouteOrder.java

@@ -67,7 +67,7 @@ public class StudentPaymentRouteOrder {
 
     private String goodsJson;
     
-    private AuditStatusEnum auditStatus = ING;
+    private AuditStatusEnum auditStatus;
     
     private String auditComment;
 

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

@@ -3610,6 +3610,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //获取当前班级剩余课次
             Map<String,Long> subCourseNumMap = MapUtil.convertIntegerMap(courseScheduleDao.querySubCourseNumMap(classGroupId));
             for (String courseType : courseTypes) {
+                groupType.add(courseType);
                 Long currentNum = subCourseNumMap.get(courseType);
                 if(currentNum == null){
                     currentNum = 0l;
@@ -3619,7 +3620,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 if(currentNum >= maxNum){
                     continue;
                 }
-                groupType.add(courseType);
                 Long subNum = maxNum - currentNum;
                 //生成缴费项目
                 MusicGroupOrganizationCourseSettingsDetail settingsDetail = new MusicGroupOrganizationCourseSettingsDetail();
@@ -3639,6 +3639,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         result.put("defaultPaymentCalender",resultMap);
         result.put("groupTypeSet",groupType);
+        result.put("classMaxCourseNumMap",map);
         return result;
     }
 
@@ -3831,7 +3832,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 //        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
         //获取所选班级最大剩余课时
         Map<String,Long> map = MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(classGroupIds));
-        Set<String> courseTypes = classCourseMinuteMap.keySet();
+        Set<String> courseTypes = map.keySet();
         for (String courseType : courseTypes) {
 //            剩余时长*默认排课时长
             resultMap.put(courseType,classCourseMinuteMap.get(courseType) * map.get(courseType));

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

@@ -461,11 +461,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                         continue;
                     }
                     if (columnValue.equals("calenderId")) {
-                        if (StringUtils.isEmpty(row.get(s).toString())) {
-                            sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不可为空;");
-                            continue valueIsNull;
-                        } else if (!schoolCalender.containsKey(row.get(s).toString())) {
+                        if (StringUtils.isNotBlank(row.get(s).toString()) && !schoolCalender.containsKey(row.get(s).toString())) {
                             sb.append("第" + rowNum).append("行数据导入失败：学校缴费项id不存在;");
+                            continue valueIsNull;
                         } else {
                             objectMap.put("calenderId", row.get(s));
                         }
@@ -517,6 +515,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     }
                 }
                 studentPaymentRouteOrder.setRouteBalanceAmount(BigDecimal.ZERO);
+                studentPaymentRouteOrder.setAuditStatus(AuditStatusEnum.ING);
                 studentPaymentRouteOrder.setRouteAmount(studentPaymentRouteOrder.getSaleAmount().add(studentPaymentRouteOrder.getServiceAmount()));
                 studentPaymentRouteOrder.setCreateBy(sysUser.getId());
                 studentPaymentRouteOrder.setUpdateBy(sysUser.getId());

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

@@ -526,7 +526,7 @@
     </select>
     <sql id="queryTeacherAttendanceComplaintsSql">
         <where>
-            cs.actual_teacher_id_ = ta.teacher_id_ AND ta.is_complaints_ = 1
+            ta.is_complaints_ = 1
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(t.organ_id_, #{organId})
             </if>