Procházet zdrojové kódy

Merge remote-tracking branch 'origin/online1' into online1

Joburgess před 4 roky
rodič
revize
af25b3b762

+ 29 - 31
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -401,26 +401,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			three.setDesc(IndexErrorType.TEACHER_INFO.getMsg());
 			List<IndexErrInfoDto> threeChild = new ArrayList<>();
 
-//			int teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
-//			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_LEAVE, IndexErrorType.TEACHER_LEAVE.getMsg(),teacherLeave, null));
-
-			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-
-			//全职未离职老师
-			//预计课酬较低
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
-
 			//课程时间安排异常
 			Integer userId = null;
 			if (!userRole.contains(SysUserRole.SECTION_MANAGER) && !sysUser.getIsSuperAdmin()) {
 				userId = sysUser.getId();
 			}
-			int courseTimeError = 0;
-			if(classGroupIds == null || classGroupIds.size() > 0){
-				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
-			}
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TIME_ERROR, IndexErrorType.COURSE_TIME_ERROR.getMsg(), courseTimeError, null));
 
 			//乐团巡查任务未计划
 			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId);
@@ -448,10 +433,21 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			//课程考勤异常
 			int attendanceError = 0;
 			int noAttendance = 0;
+			//课程时间安排异常
+			int courseTimeError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
 				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds);
 				noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime,classGroupIds);
+				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
 			}
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			//全职未离职老师
+			//预计课酬较低
+			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
+
+			fourChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TIME_ERROR, IndexErrorType.COURSE_TIME_ERROR.getMsg(), courseTimeError, null));
+
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE, IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE.getMsg(), attendanceError, null));
 
 			//课程异常
@@ -804,26 +800,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				flag3 = true;
 			}
 		}
-		if(!flag3){
-			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-			if(lowTeacherSalary > 0){
-				flag3 = true;
-			}
-		}
+
 		Integer userId = null;
 		if (!userRole.contains(SysUserRole.SECTION_MANAGER) && !sysUser.getIsSuperAdmin()) {
 			userId = sysUser.getId();
 		}
-		if(!flag3){
-			int courseTimeError = 0;
-			if(classGroupIds == null || classGroupIds.size() > 0){
-				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
-			}
-			if(courseTimeError > 0){
-				flag3 = true;
-			}
-		}
+
 		if(!flag3){
 			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr,startTime,userId);
 			if(inspectionItem > 0){
@@ -846,6 +828,22 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		boolean flag4 = false;
 		if(!flag4){
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			if(lowTeacherSalary > 0){
+				flag4 = true;
+			}
+		}
+		if(!flag4){
+			int courseTimeError = 0;
+			if(classGroupIds == null || classGroupIds.size() > 0){
+				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
+			}
+			if(courseTimeError > 0){
+				flag4 = true;
+			}
+		}
+		if(!flag4){
 			int attendanceError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
 				attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime,classGroupIds);

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/StudentVisitMapper.xml

@@ -105,6 +105,9 @@
     </select>
     <sql id="queryPageSql">
         <where>
+            <if test="search != null and search != ''">
+                AND (sv.object_id_ = #{teacher} OR t.id_ = #{teacher} OR s.id_ = #{student} OR t.real_name_ LIKE CONCAT('%',#{teacher},'%') OR s.username_ LIKE CONCAT('%',#{student},'%'))
+            </if>
             <if test="teacher != null and teacher != ''">
                 AND (t.id_ = #{teacher} OR t.real_name_ LIKE CONCAT('%',#{teacher},'%'))
             </if>