质检

src/main/java/com/ssj/dao/kmt/correctsys/impl/CorrectSysQueryDaoImpl.java

@@ -753,7 +753,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
   	public Page<Map<String,Object>> pageHomeworkCheckByInspectorIdPageSize(Map<String, Object> params, Pageable pageable) {
       	 StringBuilder sb = new StringBuilder();
       	 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(" ( ");
            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) {
     	 StringBuilder sb = new StringBuilder();
     	 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(" ( ");
          sb.append(" 	SELECT hp.homework_id FROM scon_homework_picture hp    ");

src/main/java/com/ssj/service/kmt/correctsys/KmtCorrectSysServiceImpl.java

@@ -756,7 +756,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 	                        //将超过4天的作业就不可以再质检了
 	                        if(homework.getTotal()>homework.getChecked()){
 	                        	 Calendar ca = Calendar.getInstance();
-	                             ca.setTime(DateHelper.parseDate(homework.getDate()+" 12:00:00", "yyyy-MM-dd HH:mm:ss"));
+	                             ca.setTime(DateHelper.parseDate(homework.getCorrectDate()+" 12:00:00", "yyyy-MM-dd HH:mm:ss"));
 	            		         ca.add(Calendar.DATE, 4);// num为增加的天数，可以改变的
 	            		         if(new Date().getTime()>=ca.getTime().getTime()) {
 	            		        	 homeworkCheckStudentDto.setType(1);

src/main/java/com/ssj/service/kmt/correctsys/dto/HomeworkCheckDto.java

@@ -18,6 +18,8 @@ public class HomeworkCheckDto implements Serializable {
 
     private String date;
 
+    private String correctDate;
+    
     private Integer error;
 
     private Integer checked;
@@ -95,6 +97,14 @@ public class HomeworkCheckDto implements Serializable {
 	public void setTeacherId(String teacherId) {
 		this.teacherId = teacherId;
 	}
+
+	public String getCorrectDate() {
+		return correctDate;
+	}
+
+	public void setCorrectDate(String correctDate) {
+		this.correctDate = correctDate;
+	}