update

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

@@ -816,16 +816,15 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void attendanceComplaintsAutoAffirmTask() {
-		String affirmDay = sysConfigDao.findConfigValue("attendanceComplaintsAutoAffirmDay");
+		String affirmDay = sysConfigDao.findConfigValue("attendance_complaints_auto_affirm_day");
 		if(StringUtils.isEmpty(affirmDay)){
 			affirmDay = "7";
 		}
 		List<TeacherAttendance> teacherAttendances = teacherAttendanceDao.queryAttendanceComplaintsAutoAffirmList(affirmDay);
 		teacherAttendances.forEach(e->{
-			e.setComplaintsStatus(ComplaintsStatusEnum.PASS);
-			e.setRemark("系统自动审核通过");
+			agreeTeacherAttendanceComplaints(1,1,e.getId(),"系统自动审核通过");
 		});
-//		teacherAttendanceDao.batchUpdate(teacherAttendances);
 	}
 }

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

@@ -574,7 +574,7 @@
     </select>
     <select id="queryAttendanceComplaintsAutoAffirmList" resultMap="TeacherAttendance">
         SELECT * FROM teacher_attendance
-        WHERE complaints_status_ = '2' AND TIMESTAMPDIFF(DAY,complaints_time_,NOW()) >= #{affirmDay}
+        WHERE complaints_status_ = 2 AND TIMESTAMPDIFF(DAY,complaints_time_,NOW()) >= #{affirmDay}
     </select>
 
     <update id="updateViPSignOutStatus" parameterType="string">

mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -157,6 +157,11 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 	}
 
 	@Override
+	public void attendanceComplaintsAutoAffirmTask() {
+		logger.info("考勤申述系统自动处理");
+	}
+
+	@Override
 	public void updateMusicGroupStudentFeeStatus() {
 		logger.info("更新乐团学员缴费状态失败");
 	}

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.entity.SysUserBankCard;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
+import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.upload.UploadUtil;
 import io.swagger.annotations.Api;
@@ -46,6 +47,8 @@ public class StudentManageController extends BaseController {
     private SysUserBankCardService sysUserBankCardService;
     @Autowired
     private StudentManageService studentManageService;
+    @Autowired
+    private SubjectService subjectService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentManageController.class);
 
@@ -186,4 +189,13 @@ public class StudentManageController extends BaseController {
     public Object queryStudentPer() {
         return succeed(studentManageService.queryStudentPer());
     }
+
+    @ApiOperation(value = "获取子集科目列表")
+    @GetMapping("subject/findSubSubjects")
+    public Object findSubSubjects(Integer tenantId){
+        if(tenantId == null){
+            tenantId = TenantIdThreadLocal.get();
+        }
+        return succeed(subjectService.findSubSubjects(tenantId));
+    }
 }