|
@@ -269,7 +269,7 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
|
|
List<Object> paramList = new ArrayList<>();
|
|
List<Object> paramList = new ArrayList<>();
|
|
StringBuilder sql = new StringBuilder();
|
|
StringBuilder sql = new StringBuilder();
|
|
sql.append("SELECT t.child_name as studentName,t12.homework_id as homeworkId,\n ");
|
|
sql.append("SELECT t.child_name as studentName,t12.homework_id as homeworkId,\n ");
|
|
- sql.append("SEC_TO_TIME(timestampdiff(SECOND,min(t12.create_time),NOW())) as waitTime,t12.`subject`,t13.grade \n ");
|
|
|
|
|
|
+ sql.append("concat(SEC_TO_TIME(timestampdiff(SECOND,min(t12.create_time),NOW())),'') as waitTime,t12.`subject`,t13.grade \n ");
|
|
sql.append(" from tb_lib_vip t \n ");
|
|
sql.append(" from tb_lib_vip t \n ");
|
|
sql.append("join tb_lib_vip_service t11 on t.id = t11.vip_id and t11.correct_type=100\n ");
|
|
sql.append("join tb_lib_vip_service t11 on t.id = t11.vip_id and t11.correct_type=100\n ");
|
|
sql.append("join scon_homework_picture t12 on t.id = t12.vip_id\n ");
|
|
sql.append("join scon_homework_picture t12 on t.id = t12.vip_id\n ");
|
|
@@ -336,7 +336,7 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
|
|
selSQL.append("left join tb_lib_vip t12 on t.vip_id = t12.id\n");
|
|
selSQL.append("left join tb_lib_vip t12 on t.vip_id = t12.id\n");
|
|
selSQL.append(" where t.teacher_id=?\n");
|
|
selSQL.append(" where t.teacher_id=?\n");
|
|
queryParams.add(teacherId);
|
|
queryParams.add(teacherId);
|
|
- selSQL.append("where t.is_mark in (0,2)\n");
|
|
|
|
|
|
+ selSQL.append("and t.is_mark in (0,2)\n");
|
|
selSQL.append("group by t.homework_id\n");
|
|
selSQL.append("group by t.homework_id\n");
|
|
selSQL.append(") a \n");
|
|
selSQL.append(") a \n");
|
|
selSQL.append(") b order by b.state asc \n");
|
|
selSQL.append(") b order by b.state asc \n");
|