Merge remote-tracking branch 'origin/master'

src/main/java/com/ssj/api/controller/ApiManagerTeacherQualityController.java

@@ -56,7 +56,7 @@ public class ApiManagerTeacherQualityController extends BaseController {
         	Map<String, Object> params = new HashMap<String, Object>();
         	params.put("inspectorId", userId);
         	params.put("subject", req.getSubject());
-        	params.put("childName", req.getStudnetName());
+        	params.put("childName", req.getStudentName());
         	
         	Page<HomeworkCheckSubjectDto> page = kmtCorrectSysService.pageCheckHomeworkList(params,initPage(req.getPageNo(), req.getPageSize()));
             Map<String, Object> data = new HashMap<>();

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

@@ -771,6 +771,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
            sb.append(" ) t4");
            sb.append(" LEFT JOIN scon_homework_picture t1 ON t4.homework_id = t1.homework_id  AND t1.service_type = 100 ");
            sb.append(" LEFT JOIN tb_lib_manager m1 ON t1.teacher_id=m1.user_id ");
+           sb.append(" LEFT JOIN tb_lib_vip t2 ON t1.vip_id = t2.id ");
            sb.append(" LEFT JOIN scon_homework_picture_correct hpc ON t1.id = hpc.homework_picture_id AND hpc.type = 8  ");
            sb.append(" WHERE ");
            sb.append(" m1.inspector_id =?  ");
@@ -829,7 +830,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
          }
          sb.append(" GROUP BY ");
          sb.append(" t2.child_name, t1.homework_id,	date, t1.SUBJECT ");
-         sb.append(" ORDER BY date desc ");
+         sb.append(" ORDER BY date  ");
          return dao.findList(sb.toString(), queryparams.toArray(), HomeworkCheckDto.class);
 	}
     

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

@@ -1,11 +1,13 @@
 package com.ssj.service.kmt.correctsys;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -693,7 +695,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 		calendar.set(Calendar.MINUTE, 0);
 		calendar.set(Calendar.SECOND, 0);
 		calendar.set(Calendar.MILLISECOND, 0);
-    	calendar.add(Calendar.DAY_OF_MONTH, -0);
+    	calendar.add(Calendar.DAY_OF_MONTH, -1);
     	
 		String endTime = DateUtil.format_yyyyMMddHHmmss(calendar.getTime());
     	if(curHour24<12) {
@@ -770,7 +772,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         return resultPage;
     }
     
-    
+
     /**
      * 按日期顺序插入
      *
@@ -783,7 +785,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         } else {
             boolean isLast = true;
             for (int i = 0; i < result.size(); i++) {
-                if (result.get(i).getDate().compareTo(homeworkCheckSubjectDto.getDate()) > 0) {
+                if (result.get(i).getDate().compareTo(homeworkCheckSubjectDto.getDate()) < 0) {
                     result.add(i, homeworkCheckSubjectDto);
                     isLast = false;
                     break;
@@ -795,10 +797,8 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         }
     }
 
-   
-    
-    
-    
+
+}
+
 
 
-}

src/main/java/com/ssj/service/kmt/correctsys/request/InspectorAllotListReq.java

@@ -24,8 +24,8 @@ public class InspectorAllotListReq extends BaseRequest {
     @ApiModelProperty(name="subject",value = "科目",required = true)
     private  String subject;
 
-    @ApiModelProperty(name="studnetName",value = "学生姓名",required = true)
-    private  String studnetName;
+    @ApiModelProperty(name="studentName",value = "学生姓名",required = true)
+    private  String studentName;
 
 	public int getPageNo() {
 		return pageNo;
@@ -51,14 +51,16 @@ public class InspectorAllotListReq extends BaseRequest {
 		this.subject = subject;
 	}
 
-	public String getStudnetName() {
-		return studnetName;
+	public String getStudentName() {
+		return studentName;
 	}
 
-	public void setStudnetName(String studnetName) {
-		this.studnetName = studnetName;
+	public void setStudentName(String studentName) {
+		this.studentName = studentName;
 	}
 
+	
+
 
    
 }