批注接口提交

平台老师导入增加老师类型

src/main/java/com/ssj/api/domain/vo/statistics/ListVO.java

@@ -41,6 +41,7 @@ public class ListVO extends BaseRequest {
      private Integer  notCommentNums;
      private Integer  repeatNums;
      private Integer  errorNums ;
+     private Integer  totalNums ;
      private String   calculateDate ;
 
     public String getTeacherId() {
@@ -138,4 +139,12 @@ public class ListVO extends BaseRequest {
     public void setCalculateDate(String calculateDate) {
         this.calculateDate = calculateDate;
     }
+
+    public Integer getTotalNums() {
+        return totalNums;
+    }
+
+    public void setTotalNums(Integer totalNums) {
+        this.totalNums = totalNums;
+    }
 }

src/main/java/com/ssj/bean/statistics/PlatTeacherStatistics.java

@@ -23,6 +23,7 @@ public class PlatTeacherStatistics extends BaseEntity {
     private Integer  notCommentNums;
     private Integer  repeatNums;
     private Integer  errorNums ;
+    private Integer  totalNums ;
     private String  calculateDate;
     private Date createTime;
 
@@ -105,4 +106,12 @@ public class PlatTeacherStatistics extends BaseEntity {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getTotalNums() {
+        return totalNums;
+    }
+
+    public void setTotalNums(Integer totalNums) {
+        this.totalNums = totalNums;
+    }
 }

src/main/java/com/ssj/bean/sys/imlibuser/TbClassTeacherTemp.java

@@ -1,9 +1,11 @@
 package com.ssj.bean.sys.imlibuser;
 
 import com.ssj.bean.common.framework.core.domain.BaseEntity;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 
 
@@ -44,6 +46,8 @@ public class TbClassTeacherTemp  extends BaseEntity {
 
     private String inspectorId;
 
+    private Integer type;
+
 	public String getLibId() {
 		return libId;
 	}
@@ -163,4 +167,13 @@ public class TbClassTeacherTemp  extends BaseEntity {
 	public void setInspectorId(String inspectorId) {
 		this.inspectorId = inspectorId;
 	}
+
+	@Transient
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

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

@@ -312,7 +312,7 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
         selSQL.append("SELECT b.homework_id,b.student_name ,b.`subject`,b.grade,b.correctNums as correct_nums,b.totalNums as total_nums,\n");
         selSQL.append("case when state in (6,7) then concat(DATE_FORMAT(SEC_TO_TIME(b.next_1),'%i分%s秒'),'/张') \n");
         selSQL.append("when state =4 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");
+        selSQL.append("when state = 2 then concat('等待',SEC_TO_TIME(TIMESTAMPDIFF(SECOND,b.allot_time,NOW())))\n");
         selSQL.append("else '作业已超时' end state_msg,b.state \n");
         selSQL.append("from (\n");
         selSQL.append("SELECT a.homework_id,a.student_name,a.`subject`,a.grade,a.correctNums,a.totalNums, \n");

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

@@ -1313,7 +1313,7 @@ public class LibJoinQueryDaoImpl implements ILibJoinQueryDao{
 		selSQL.append("(SELECT count(DISTINCT a.homework_id) from scon_homework_picture a join scon_homework_picture_correct b on b.homework_picture_id = a.id where a.teacher_id = t.user_id and a.is_mark in (0,2) and b.type=8  \n" +
 				"and ((b.end_time > ? and a.is_feedback=1) or a.is_feedback=0) ) as wait_nums2, \n");
 		queryParams.add(params.get("beginTime"));
-		selSQL.append("(SELECT ifnull(concat(SEC_TO_TIME(TIMESTAMPDIFF(SECOND,min(a.allot_time),NOW())),''),'00:00:00')   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 wait_max_time, \n");
+		selSQL.append("(SELECT ifnull(concat(SEC_TO_TIME(TIMESTAMPDIFF(SECOND,min(a.allot_time),NOW())),''),'00:00:00')   from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback = 0 and  not exists (select 1 from scon_homework_picture_correct x where x.type=8 and x.start_time is not null and a.homework_id = x.homework_id ) ) as wait_max_time, \n");
 		selSQL.append("t.user_id as teacher_id,t.name as teacher_name, \n");
 		selSQL.append("(select ifnull(concat(SEC_TO_TIME(sum(b.correction_time)),''),'00:00:00') from scon_homework_picture a join scon_homework_picture_correct b on a.id = b.homework_picture_id where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1 and b.end_time >?) as today_correct_time, \n");
 		queryParams.add(params.get("beginTime"));

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherTempServiceImpl.java

@@ -357,7 +357,12 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					user.setUserName(tbLibImTeacherTemp.getTeacherName());
 					user.setMobile(tbLibImTeacherTemp.getTeacherPhone());
 					user.setCreateTime(new Date());
-					user.setPassword("123456");
+					if(tbLibImTeacherTemp.getType()==30){
+						user.setPassword("123456");
+					}else{
+						user.setPassword("123@abc123");
+					}
+
 					user.setPwdSalt(PasswordUtil.generateSalt());
 					user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
 					user=userService.save(user);
@@ -369,7 +374,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbLibManager=new TbLibManager();
 					tbLibManager.settPhoto(user.getPhoto());
 					tbLibManager.setUserId(user.getId());
-					tbLibManager.setType(Constant.ALL_TEACHER_TYPE);
+					tbLibManager.setType(tbLibImTeacherTemp.getType());
 					tbLibManager.setCreateTime(new Date());
 					tbLibManager.setName(tbLibImTeacherTemp.getTeacherName());
 					tbLibManager.setTelephone(tbLibImTeacherTemp.getTeacherPhone());

src/main/java/com/ssj/statistics/dao/IStatisticsDao.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface IStatisticsDao extends JpaRepository<PlatTeacherStatistics,String> {
-    @Query(nativeQuery = true,value = "delete from plat_teacher_statistics where to_days(create_time)<to_days(?1)")
+    @Query(nativeQuery = true,value = "delete from plat_teacher_statistics where calculate_date<?1")
     @Modifying
     void deleteOldData(String dataDate);
 }

src/main/java/com/ssj/statistics/dao/impl/StatisticsQueryImpl.java

@@ -47,7 +47,7 @@ public class StatisticsQueryImpl implements IStatisticsQueryDao {
          */
         sql.append("select a.correctNums,a.overtimeNums, ");
         sql.append("a.notCorrectNums,a.notCommentNums, ");
-        sql.append("a.repeatNums,concat(a.accuracy,'%') as accuracy,a.errorNums,a.teacherId,a.teacherName,a.subject,a.allSubject ");
+        sql.append("a.repeatNums,concat(floor(100*(a.totalNums- a.errorNums-a.notCorrectNums)/a.totalNums),'%') as accuracy,a.errorNums,a.teacherId,a.teacherName,a.subject,a.allSubject ");
         sql.append(" from (");
         listInfo(params,queryParams,sql);
         sql.append(" ) a");
@@ -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(avg(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,sum(t.total_nums) as totalNums \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");
@@ -141,7 +141,7 @@ public class StatisticsQueryImpl implements IStatisticsQueryDao {
         StringBuffer sql = new StringBuffer();
         sql.append("select ifnull(sum(a.correctNums),0) as correctTotalNums,ifnull(sum(overtimeNums),0) as overtimeTotalNums, ");
         sql.append("ifnull(sum(a.notCorrectNums),0) as notCorrectTotalNums,ifnull(sum(notCommentNums),0) as notCommentTotalNums, ");
-        sql.append("ifnull(sum(a.repeatNums),0) as repeatTotalNums,concat(round(ifnull(avg(accuracy),0),2),'%') as accuracyTotal,ifnull(sum(errorNums),0) as errorTotalNums ");
+        sql.append("ifnull(sum(a.repeatNums),0) as repeatTotalNums,concat(floor(100*(sum(a.totalNums)- sum(a.errorNums)-sum(a.notCorrectNums))/sum(a.totalNums)),'%') as accuracyTotal,ifnull(sum(errorNums),0) as errorTotalNums ");
         sql.append(" from (");
         List<Object> queryParams = new ArrayList<>();
         listInfo(params,queryParams,sql);
@@ -154,7 +154,7 @@ 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,a.calculate_date\n");
+        sql.append("floor(100*(a.total- a.error_nums-a.not_correct_nums)/a.total) as accuracy,a.calculate_date,a.total as total_nums\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("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" +

src/main/java/com/ssj/sys/controller/ImLibUserController.java

@@ -888,6 +888,7 @@ public class ImLibUserController extends BaseController {
 					tbLibImTeacherTemp.setGrade(map.get("data_2"));
 					tbLibImTeacherTemp.setClassName(map.get("data_3"));
 					tbLibImTeacherTemp.setSubject(map.get("data_4"));
+					tbLibImTeacherTemp.setType(Integer.parseInt(map.get("data_5")));
 					tbLibImTeacherTemp.setIsCorrect(1);
 
 					tbLibImTeacherTemps.add(tbLibImTeacherTemp);