质检

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ssj.api.security.annotation.IgnoreSecurity;
 import com.ssj.api.security.annotation.ModifySecurity;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
 import com.ssj.framework.core.common.controller.BaseController;
@@ -22,7 +23,6 @@ import com.ssj.framework.core.util.ResponseConstant;
 import com.ssj.framework.core.util.ResponseEntity;
 import com.ssj.service.kmt.correctsys.dto.HomeworkCheckSubjectDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkPictureCheckDto;
-import com.ssj.service.kmt.correctsys.request.CorrectCheckInspectorReq;
 import com.ssj.service.kmt.correctsys.request.CorrectCheckReq;
 import com.ssj.service.kmt.correctsys.request.InspectorAllotListReq;
 import com.ssj.service.kmt.correctsys.request.TeacherAllotReq;
@@ -43,10 +43,10 @@ public class ApiManagerTeacherQualityController extends BaseController {
     @Autowired
     private KmtCorrectSysService kmtCorrectSysService;
 
-
+	@IgnoreSecurity
     @RequestMapping(value = "/findCheckHomeworkList",method = RequestMethod.POST)
     @ApiOperation(value ="查询质检列表数据",httpMethod = "POST",notes = "查询质检列表数据")
-    public ResponseEntity findCheckHomeworkList(@RequestParam String accessToken,@RequestBody @Valid InspectorAllotListReq req){
+    public ResponseEntity findCheckHomeworkList(@RequestParam(name = "accessToken") String accessToken,@RequestBody @Valid InspectorAllotListReq req){
         ResponseEntity responseEntity = new ResponseEntity();
         try {
         	String userId = tokenManager.getUserId(accessToken);
@@ -60,9 +60,12 @@ public class ApiManagerTeacherQualityController extends BaseController {
         	params.put("subject", req.getSubject());
         	params.put("childName", req.getChildName());
         	
-        	Page<HomeworkCheckSubjectDto> list = kmtCorrectSysService.pageCheckHomeworkList(params,initPage(req.getPageNo(), req.getPageSize()));
+        	Page<HomeworkCheckSubjectDto> page = kmtCorrectSysService.pageCheckHomeworkList(params,initPage(req.getPageNo(), req.getPageSize()));
             Map<String, Object> data = new HashMap<>();
-            data.put("subjectDates", list);
+            data.put("pages", page.getTotalPages());
+            data.put("pageNo", req.getPageNo());
+            data.put("pageSize", req.getPageSize());
+            data.put("list", page.getContent());
             responseEntity.success(data, "请求成功");
         } catch (Exception e) {
             logger.error("异常",e);
@@ -72,9 +75,10 @@ public class ApiManagerTeacherQualityController extends BaseController {
 
     }
 
+	@IgnoreSecurity
     @RequestMapping(value = "/findCheckHomeworkPictureList", method = RequestMethod.POST)
     @ApiOperation(value ="查询质检作业图片列表数据",httpMethod = "POST",notes = "查询质检作业图片列表数据")
-    public ResponseEntity findCheckHomeworkPictureList(@RequestParam String accessToken,@RequestBody @Valid TeacherAllotReq req){
+    public ResponseEntity findCheckHomeworkPictureList(@RequestParam(name = "accessToken") String accessToken,@RequestBody @Valid TeacherAllotReq req){
         ResponseEntity responseEntity = new ResponseEntity();
         try {
             List<HomeworkPictureCheckDto> homeworkPictures = kmtCorrectSysService.findCheckHomeworkPictureList(req.getHomeworkId(), req.getTeacherId());
@@ -89,10 +93,11 @@ public class ApiManagerTeacherQualityController extends BaseController {
 
     }
 
+	@IgnoreSecurity
     @ModifySecurity
     @RequestMapping(value = "/correctCheck", method = RequestMethod.POST)
     @ApiOperation(value = "提交质检结果", httpMethod = "POST", notes = "提交质检结果")
-    public ResponseEntity correctCheck(@RequestParam(name = "accessToken") String accessToken, @RequestBody CorrectCheckReq req) {
+    public ResponseEntity correctCheck(@RequestParam(name = "accessToken") String accessToken,@RequestBody CorrectCheckReq req) {
     	ResponseEntity responseEntity = new ResponseEntity();
         try {
         	String userId = tokenManager.getUserId(accessToken);

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

@@ -758,7 +758,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
            sb.append(" ( ");
            sb.append(" 	SELECT hp.homework_id FROM scon_homework_picture hp    ");
            sb.append("  	LEFT JOIN tb_lib_manager m ON hp.teacher_id=m.user_id ");
-           sb.append(" 		WHERE hp.service_type = 1 AND m.inspector_id =? AND hp.create_time BETWEEN ? AND ? ");
+           sb.append(" 		WHERE hp.service_type = 1 AND m.inspector_id =? AND TO_DAYS(hp.create_time)>=TO_DAYS(?) AND TO_DAYS(hp.create_time)<=TO_DAYS(?) ");
            
            queryparams.add(params.get("inspectorId"));
            queryparams.add(params.get("beginTime"));
@@ -800,7 +800,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
          sb.append(" ( ");
          sb.append(" 	SELECT hp.homework_id FROM scon_homework_picture hp    ");
          sb.append("  	LEFT JOIN tb_lib_manager m ON hp.teacher_id=m.user_id ");
-         sb.append(" 		WHERE hp.service_type = 1 AND m.inspector_id =? AND hp.create_time BETWEEN ? AND ? ");
+         sb.append(" 		WHERE hp.service_type = 1 AND m.inspector_id =? AND TO_DAYS(hp.create_time)>=TO_DAYS(?) AND TO_DAYS(hp.create_time)<=TO_DAYS(?) ");
          
          queryparams.add(inspectorId);
          queryparams.add(beginTime);
@@ -828,7 +828,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
         	 queryparams.add(subject);
          }
          sb.append(" GROUP BY ");
-         sb.append(" t2.child_name, 	t1.homework_id,	date,	t1.SUBJECT ");
+         sb.append(" t2.child_name, t1.homework_id,	date, t1.SUBJECT ");
          sb.append(" ORDER BY date desc ");
          return dao.findList(sb.toString(), queryparams.toArray(), HomeworkCheckDto.class);
 	}

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

@@ -99,13 +99,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 
     @Override
     public List<HomeworkPictureCheckDto> findCheckHomeworkPictureList(String homeworkId, String teacherId) {
-    	int teacherType = managerService.findCorrectOrKnowRoleByUserId(teacherId);
-        List<HomeworkPictureCheckDto> result = null;
-        if (teacherType == Constant.CORRECT_KNOW_TYPE) {
-            result = this.findKnowledgeCheckHomeworkPictureList(homeworkId, teacherId);
-        } else if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
-            result = this.findCorrectCheckHomeworkPictureList(homeworkId, teacherId);
-        }
+        List<HomeworkPictureCheckDto> result = this.findCorrectCheckHomeworkPictureList(homeworkId, teacherId);
         return result;
     }
 
@@ -371,9 +365,6 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
     public List<HomeworkPictureCheckDto> findCorrectCheckHomeworkPictureList(String homeworkId, String teacherId) {
         List<HomeworkPictureDto> homeworkPictures =
                 homeworkPictureService.findCheckHomeworkPictureByHomeworkId(homeworkId);
-        if(StringUtils.isEmpty(teacherId) && homeworkPictures.size()>0) {
-        	teacherId=homeworkPictures.get(0).getTeacherId();
-        }
         List<HomeworkPictureCheckDto> result = new ArrayList<>();
         List<HomeworkExerciseQuestionsDto> exerciseQuestionDtos =
                 correctSysQueryDao.findHomeworkCorrectedQuestions(homeworkId);
@@ -671,7 +662,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
             TbLibManager correctTeacher = null;
             if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
                 List<TbLibManager> libManagerList =
-                        managerService.findByUserIdAndTypeIn(homeworkPicture.getTeacherId(), new int[]{8, 11});
+                        managerService.findByUserIdAndTypeIn(homeworkPicture.getTeacherId(), new int[]{30});
                 if (CollectionUtils.isNotEmpty(libManagerList)) {
                     correctTeacher = libManagerList.get(0);
                     String content = correctTeacher.getName() + "老师，您有一份新的作业报错提醒，赶快来查看。";
@@ -753,11 +744,11 @@ 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, -1);
+    	calendar.add(Calendar.DAY_OF_MONTH, -0);
     	
 		String endTime = DateUtil.format_yyyyMMddHHmmss(calendar.getTime());
     	if(curHour24<12) {
-    		calendar.add(Calendar.DAY_OF_MONTH, -2);  
+    		calendar.add(Calendar.DAY_OF_MONTH, -1);  
     		endTime = DateUtil.format_yyyyMMddHHmmss(calendar.getTime());
     	}
         String beginTime = DateUtil.dateIncreaseByDay(endTime, "yyyy-MM-dd", -150) + " 00:00:00";
@@ -797,7 +788,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 	                    homeworkList = subjectMap.get(subject);
 	                    HomeworkCheckSubjectDto homeworkCheckSubjectDto = new HomeworkCheckSubjectDto();
 	                    homeworkCheckSubjectDto.setDate(date);
-	                    homeworkCheckSubjectDto.setSubject(subject);
+	                    //homeworkCheckSubjectDto.setSubject(subject);
 	                    for (HomeworkCheckDto homework : homeworkList) {
 	                        HomeworkCheckStudentDto homeworkCheckStudentDto = new HomeworkCheckStudentDto();
 	                        homeworkCheckStudentDto.setHomeworkId(homework.getHomeworkId());
@@ -805,6 +796,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 	                        homeworkCheckStudentDto.setGrade(homework.getGrade());
 	                        homeworkCheckStudentDto.setCheckedCount(homework.getChecked());
 	                        homeworkCheckStudentDto.setTotalCount(homework.getTotal());
+	                        homeworkCheckStudentDto.setTeacherId(homework.getTeacherId());
 	                        if (homework.getError() != null && homework.getError() > 0) {
 	                            homeworkCheckStudentDto.setErrorCount(homework.getError());
 	                        }else {

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

@@ -10,6 +10,8 @@ public class HomeworkCheckStudentDto implements Serializable {
      * 作业id
      */
     private String homeworkId;
+    
+    private String teacherId;
 
     private String studentName;
 
@@ -93,5 +95,13 @@ public class HomeworkCheckStudentDto implements Serializable {
 	public void setErrorCount(int errorCount) {
 		this.errorCount = errorCount;
 	}
+
+	public String getTeacherId() {
+		return teacherId;
+	}
+
+	public void setTeacherId(String teacherId) {
+		this.teacherId = teacherId;
+	}
     
 }

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

@@ -10,8 +10,6 @@ public class HomeworkCheckSubjectDto implements Serializable {
 
     private String date;
 
-    private String subject;
-
     private List<HomeworkCheckStudentDto> students = new ArrayList<>();
 
     public String getDate() {
@@ -22,14 +20,6 @@ public class HomeworkCheckSubjectDto implements Serializable {
         this.date = date;
     }
 
-    public String getSubject() {
-        return subject;
-    }
-
-    public void setSubject(String subject) {
-        this.subject = subject;
-    }
-
     public List<HomeworkCheckStudentDto> getStudents() {
         return students;
     }

src/main/java/com/ssj/service/sys/homework/service/impl/HomeworkPictureCorrectServiceImpl.java

@@ -25,7 +25,7 @@ public class HomeworkPictureCorrectServiceImpl extends BaseServiceImpl<HomeworkP
 
     @Override
     public PagingAndSortingRepository<HomeworkPictureCorrect, String> getDao() {
-        return null;
+        return dao;
     }
 
     @Override