|
@@ -753,7 +753,7 @@ 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.correct_time) date ");
|
|
|
|
|
|
+ sb.append(" SELECT date(t1.create_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 ");
|
|
@@ -796,7 +796,7 @@ 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.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(" SELECT t2.child_name, t1.homework_id,t1.teacher_id, t1.SUBJECT, t2.grade, date( t1.create_time ) date,date( t1.correct_time ) correct_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 ");
|