|
@@ -57,7 +57,7 @@ public class StatisticsQueryImpl implements IStatisticsQueryDao {
|
|
|
private void listInfo(Map<String, Object> params,List<Object> queryParams,StringBuffer sql){
|
|
|
sql.append("select t.teacher_id as teacherId,t11.name as teacherName,t11.course_name as subject,t11.course_name as allSubject, \n");
|
|
|
sql.append(" sum(t.correct_nums) as correctNums,sum(t.overtime_nums) as overtimeNums,sum(t.not_correct_nums) as notCorrectNums, \n");
|
|
|
- sql.append(" sum(t.not_comment_nums) as notCommentNums,sum(t.repeat_nums) as repeatNums,round((t.accuracy),2) as accuracy,sum(t.error_nums) as errorNums \n");
|
|
|
+ sql.append(" sum(t.not_comment_nums) as notCommentNums,sum(t.repeat_nums) as repeatNums,round(avg(t.accuracy),2) as accuracy,sum(t.error_nums) as errorNums \n");
|
|
|
sql.append(" from plat_teacher_statistics t \n");
|
|
|
sql.append(" left join tb_lib_manager t11 on t.teacher_id = t11.user_id \n");
|
|
|
sql.append(" where t11.type = 30 \n");
|
|
@@ -154,21 +154,23 @@ public class StatisticsQueryImpl implements IStatisticsQueryDao {
|
|
|
StringBuffer sql = new StringBuffer();
|
|
|
List<Object> queryParams = new ArrayList<>();
|
|
|
sql.append("SELECT a.teacher_id,a.teacher_name,a.`subject`,a.all_subject,a.correct_nums,a.overtime_nums,a.not_correct_nums,a.not_comment_nums,a.repeat_nums,a.error_nums,\n");
|
|
|
- sql.append("floor(100*(a.total- a.error_nums-a.not_correct_nums)/a.total) as accuracy\n");
|
|
|
+ sql.append("floor(100*(a.total- a.error_nums-a.not_correct_nums)/a.total) as accuracy,a.calculate_date\n");
|
|
|
sql.append("from (\n");
|
|
|
sql.append("SELECT t12.name as teacher_name,t.teacher_id,t.`subject`,t12.course_name as all_subject,count(if(t.is_mark in (0,2) and t.is_feedback=1,true,NULL)) as correct_nums, \n");
|
|
|
- sql.append("0 as overtime_nums,\n");
|
|
|
+ sql.append("count(if(t.is_feedback=1 and (DATE_FORMAT(t.create_time,'%H:%i')>='20:30' and DATE_FORMAT(t11.end_time,'%Y-%m-%d %H:%i:%s')>concat(DATE_FORMAT(DATE_ADD(t.create_time,interval 1 day),'%Y-%m-%d'),' 12:00:00'))\n" +
|
|
|
+ " or (DATE_FORMAT(t.create_time,'%H:%i')<'20:30' and DATE_FORMAT(t11.end_time,'%Y-%m-%d %H:%i:%s')>concat(DATE_FORMAT(t.create_time,'%Y-%m-%d'),' 23:59:59')),true,null)) as overtime_nums,\n");
|
|
|
sql.append("count(1) as total,\n");
|
|
|
- sql.append("count(if(t11.start_time is null,true,null)) as not_correct_nums,\n");
|
|
|
+ sql.append("DATE_FORMAT(t.create_time,'%Y-%m-%d') as calculate_date,\n");
|
|
|
+ sql.append("count(if(t11.start_time is null and t.is_mark in (0,2),true,null)) as not_correct_nums,\n");
|
|
|
sql.append("count(if(t.is_mark=10,true,null)) as not_comment_nums,\n");
|
|
|
sql.append("count(if(t.is_mark=15,true,null)) as repeat_nums,\n");
|
|
|
sql.append("count(if(t11.is_check_error=1,true,null)) as error_nums\n");
|
|
|
sql.append("from scon_homework_picture t \n");
|
|
|
- sql.append("left join scon_homework_picture_correct t11 on t.id = t11.homework_picture_id and t11.type = 8\n");
|
|
|
+ sql.append("left join scon_homework_picture_correct t11 on t.id = t11.homework_picture_id \n");
|
|
|
sql.append("left join tb_lib_manager t12 on t.teacher_id = t12.user_id\n");
|
|
|
- sql.append("where t12.type = 30 and to_days(t.create_time)= to_days(?)\n");
|
|
|
+ sql.append("where t12.type = 30 and t11.type = 8 and to_days(t.create_time)<= to_days(?)\n");
|
|
|
queryParams.add(dateTime);
|
|
|
- sql.append("GROUP BY t.teacher_id\n");
|
|
|
+ sql.append("GROUP BY t.teacher_id,to_days(t.create_time)\n");
|
|
|
sql.append(")a");
|
|
|
return dao.findList(sql.toString(),queryParams.toArray(),ListVO.class);
|
|
|
}
|
|
@@ -183,12 +185,12 @@ public class StatisticsQueryImpl implements IStatisticsQueryDao {
|
|
|
sql.append("from (\n" );
|
|
|
sql.append("SELECT\n" );
|
|
|
sql.append("count(1) as correct_nums,\n" );
|
|
|
- sql.append("count(if((DATE_FORMAT(t11.create_time,'%i:%s')>='20:30' and DATE_FORMAT(now(),'%Y-%m-%d %H%i:%s')>concat(DATE_FORMAT(DATE_ADD(t11.create_time,interval 1 day),'%Y-%m-%d'),' 12:00:00'))\n");
|
|
|
- sql.append(" or (DATE_FORMAT(t11.create_time,'%i:%s')<'20:30' and DATE_FORMAT(now(),'%Y-%m-%d %H%i:%s')>concat(DATE_FORMAT(t11.create_time,'%Y-%m-%d'),' 23:59:59')),true,null)) as overtime_nums,\n");
|
|
|
- sql.append("count(IF(DATE_FORMAT(t.end_time,'%H:%s')>='18:00' and DATE_FORMAT(t.end_time,'%H:%s')<='20:00',TRUE,null)) as perk_nums,\n" );
|
|
|
+ sql.append("count(if((DATE_FORMAT(t11.create_time,'%i:%s')>='20:30' and DATE_FORMAT(t.end_time,'%Y-%m-%d %H:%i:%s')>concat(DATE_FORMAT(DATE_ADD(t11.create_time,interval 1 day),'%Y-%m-%d'),' 12:00:00'))\n");
|
|
|
+ sql.append(" or (DATE_FORMAT(t11.create_time,'%H:%i')<'20:30' and DATE_FORMAT(t.end_time,'%Y-%m-%d %H:%i:%s')>concat(DATE_FORMAT(t11.create_time,'%Y-%m-%d'),' 23:59:59')),true,null)) as overtime_nums,\n");
|
|
|
+ sql.append("count(IF(DATE_FORMAT(t.end_time,'%H:%i')>='18:00' and DATE_FORMAT(t.end_time,'%H:%i')<='20:00',TRUE,null)) as perk_nums,\n" );
|
|
|
sql.append("count(IF(t.is_check_error=1,TRUE,null)) as error_nums,\n" );
|
|
|
sql.append("DATE_FORMAT(t.end_time,'%Y-%m-%d') as work_date,\n" );
|
|
|
- sql.append("sum(IF(DATE_FORMAT(t.end_time,'%H:%s')>='18:00' and DATE_FORMAT(t.end_time,'%H:%s')<='20:00',t.correction_time,0)) as sum_perk,\n" );
|
|
|
+ sql.append("sum(IF(DATE_FORMAT(t.end_time,'%H:%i')>='18:00' and DATE_FORMAT(t.end_time,'%H:%i')<='20:00',t.correction_time,0)) as sum_perk,\n" );
|
|
|
sql.append("t11.teacher_id,\n" );
|
|
|
sql.append("t.end_time,\n" );
|
|
|
sql.append("t.start_time \n" );
|