批注接口提交

src/main/java/com/ssj/dao/sys/homework/dao/impl/HomeworkQueryDaoImpl.java

@@ -307,7 +307,7 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
     public List<Map<String, Object>> teacherStudentList(String teacherId,String beginTime) {
         StringBuilder selSQL = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSQL.append("SELECT b.homework_id,b.student_name,b.`subject`,b.grade,b.correctNums,b.totalNums ,\n");
+        selSQL.append("SELECT b.homework_id as homeworkId,b.student_name as studentName,b.`subject`,b.grade,b.correctNums,b.totalNums ,\n");
         selSQL.append("case when state in (4,5) then concat(DATE_FORMAT(SEC_TO_TIME(b.next_1),'%i分%s秒'),'/张') \n");
         selSQL.append("when state = 3 then concat(DATE_FORMAT(SEC_TO_TIME(b.start_time),'%i:%s'),'开始批注')\n");
         selSQL.append("when state = 2 then concat('等待',DATE_FORMAT(SEC_TO_TIME(TIMESTAMPDIFF(SECOND,b.allot_time,NOW())),'%i:%s'))\n");

src/main/java/com/ssj/dao/weixin/library/dao/impl/LibJoinQueryDaoImpl.java

@@ -1310,8 +1310,10 @@ public class LibJoinQueryDaoImpl implements ILibJoinQueryDao{
 		selSQL.append("(SELECT count(DISTINCT a.homework_id) from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback = 0) as waitNums, \n");
 		selSQL.append("(SELECT concat(SEC_TO_TIME(TIMESTAMPDIFF(SECOND,min(a.allot_time),NOW())),'')   from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback = 0) as waitMaxTime, \n");
 		selSQL.append("t.user_id as teacherId,t.name as teacherName, \n");
-		selSQL.append("(select concat(SEC_TO_TIME(sum(a.correction_time)),'') from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1) as todayCorrectTime, \n");
-		selSQL.append("(select concat(SEC_TO_TIME(floor(sum(a.correction_time)/count(1))),'') from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1) as efficiency, \n");
+		selSQL.append("(select concat(SEC_TO_TIME(sum(a.correction_time)),'') from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1 and t.create_time > ?) as todayCorrectTime, \n");
+		queryParams.add(params.get("beginTime"));
+		selSQL.append("(select concat(SEC_TO_TIME(floor(sum(TIMESTAMPDIFF(SECOND,a.allot_time,b.start_time))/count(1))),'') from scon_homework_picture a join scon_homework_picture_correct b on a.id = b.homework_picture_id and b.type=8 where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1 and t.create_time > ?) as efficiency, \n");
+		queryParams.add(params.get("beginTime"));
 		selSQL.append("t.is_online as state  \n");
 		selSQL.append("from tb_lib_manager t  \n");
 		selSQL.append("where t.type=30 \n");

src/main/java/com/ssj/service/weixin/library/service/impl/BookManagerServiceImpl.java

@@ -17,6 +17,7 @@ import com.ssj.framework.basic.utils.DateHelper;
 import com.ssj.framework.core.common.service.BaseServiceImpl;
 import com.ssj.framework.core.util.*;
 import com.ssj.framework.idworker.IdWorker;
+import com.ssj.framework.weixin.util.DateUtil;
 import com.ssj.service.conch.curator.request.CreateTeacherRequest;
 import com.ssj.service.conch.teacher.app.request.VcodeSubmitReq;
 import com.ssj.service.mapper.LibManagerMapper;
@@ -1035,8 +1036,25 @@ public class BookManagerServiceImpl extends BaseServiceImpl<TbLibManager, String
 
     @Override
     public Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage) {
+        params.put("beginTime",getBeginTime());
         return libJoinQueryDao.findTeacherHomeworkList(params,initPage);
     }
+
+    private String getBeginTime() {
+        Date now = new Date();
+        String nowString = DateUtil.format_yyyyMMddHHmmss(now);
+        String today = DateUtil.format_yyyyMMdd(now);
+        String today2pm = today + " 14:00:00";
+        String beginTime;
+        if (nowString.compareTo(today2pm) >= 0) {
+            //超过下午2点获取今天的数据
+            beginTime = today;
+        } else {
+            //获取昨天
+            beginTime = DateUtil.format_yyyyMMdd(DateUtil.addDays(now, -1));
+        }
+        return beginTime;
+    }
 }