|
@@ -753,12 +753,12 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
|
|
public Page<Map<String,Object>> pageHomeworkCheckByInspectorIdPageSize(Map<String, Object> params, Pageable pageable) {
|
|
public Page<Map<String,Object>> pageHomeworkCheckByInspectorIdPageSize(Map<String, Object> params, Pageable pageable) {
|
|
StringBuilder sb = new StringBuilder();
|
|
StringBuilder sb = new StringBuilder();
|
|
List<Object> queryparams = new ArrayList<>();
|
|
List<Object> queryparams = new ArrayList<>();
|
|
- sb.append(" SELECT date(t1.create_time) date ");
|
|
|
|
|
|
+ sb.append(" SELECT date(t1.correct_time) date ");
|
|
sb.append(" FROM ");
|
|
sb.append(" FROM ");
|
|
sb.append(" ( ");
|
|
sb.append(" ( ");
|
|
sb.append(" SELECT hp.homework_id FROM scon_homework_picture hp ");
|
|
sb.append(" SELECT hp.homework_id FROM scon_homework_picture hp ");
|
|
sb.append(" LEFT JOIN tb_lib_manager m ON hp.teacher_id=m.user_id ");
|
|
sb.append(" LEFT JOIN tb_lib_manager m ON hp.teacher_id=m.user_id ");
|
|
- sb.append(" WHERE hp.service_type = 100 AND m.inspector_id =? AND TO_DAYS(hp.create_time)>=TO_DAYS(?) AND TO_DAYS(hp.create_time)<=TO_DAYS(?) ");
|
|
|
|
|
|
+ sb.append(" WHERE hp.service_type = 100 AND m.inspector_id =? AND TO_DAYS(hp.correct_time)>=TO_DAYS(?) AND TO_DAYS(hp.correct_time)<=TO_DAYS(?) ");
|
|
|
|
|
|
queryparams.add(params.get("inspectorId"));
|
|
queryparams.add(params.get("inspectorId"));
|
|
queryparams.add(params.get("beginTime"));
|
|
queryparams.add(params.get("beginTime"));
|
|
@@ -796,12 +796,12 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
|
|
public List<HomeworkCheckDto> findHomeworkCheckByInspectorIdList(String inspectorId,String childName,String subject,String beginTime, String endTime) {
|
|
public List<HomeworkCheckDto> findHomeworkCheckByInspectorIdList(String inspectorId,String childName,String subject,String beginTime, String endTime) {
|
|
StringBuilder sb = new StringBuilder();
|
|
StringBuilder sb = new StringBuilder();
|
|
List<Object> queryparams = new ArrayList<>();
|
|
List<Object> queryparams = new ArrayList<>();
|
|
- sb.append(" SELECT t2.child_name, t1.homework_id,t1.teacher_id, t1.SUBJECT, t2.grade, date( t1.create_time ) date, sum( hpc.is_check_error ) error, sum( CASE WHEN hpc.check_date IS NOT NULL THEN 1 ELSE 0 END ) checked, sum( 1 ) total ");
|
|
|
|
|
|
+ sb.append(" SELECT t2.child_name, t1.homework_id,t1.teacher_id, t1.SUBJECT, t2.grade, date( t1.correct_time ) date, sum( hpc.is_check_error ) error, sum( CASE WHEN hpc.check_date IS NOT NULL THEN 1 ELSE 0 END ) checked, sum( 1 ) total ");
|
|
sb.append(" FROM ");
|
|
sb.append(" FROM ");
|
|
sb.append(" ( ");
|
|
sb.append(" ( ");
|
|
sb.append(" SELECT hp.homework_id FROM scon_homework_picture hp ");
|
|
sb.append(" SELECT hp.homework_id FROM scon_homework_picture hp ");
|
|
sb.append(" LEFT JOIN tb_lib_manager m ON hp.teacher_id=m.user_id ");
|
|
sb.append(" LEFT JOIN tb_lib_manager m ON hp.teacher_id=m.user_id ");
|
|
- sb.append(" WHERE hp.service_type = 100 AND m.inspector_id =? AND TO_DAYS(hp.create_time)>=TO_DAYS(?) AND TO_DAYS(hp.create_time)<=TO_DAYS(?) ");
|
|
|
|
|
|
+ sb.append(" WHERE hp.service_type = 100 AND m.inspector_id =? AND TO_DAYS(hp.correct_time)>=TO_DAYS(?) AND TO_DAYS(hp.correct_time)<=TO_DAYS(?) ");
|
|
|
|
|
|
queryparams.add(inspectorId);
|
|
queryparams.add(inspectorId);
|
|
queryparams.add(beginTime);
|
|
queryparams.add(beginTime);
|