质检

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

@@ -23,6 +23,7 @@ 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;
 import com.ssj.service.kmt.correctsys.service.KmtCorrectSysService;
@@ -76,8 +77,7 @@ public class ApiManagerTeacherQualityController extends BaseController {
     public ResponseEntity findCheckHomeworkPictureList(@RequestParam String accessToken,@RequestBody @Valid TeacherAllotReq req){
         ResponseEntity responseEntity = new ResponseEntity();
         try {
-            String userId = tokenManager.getUserId(accessToken);
-            List<HomeworkPictureCheckDto> homeworkPictures = kmtCorrectSysService.findCheckHomeworkPictureList(req.getHomeworkId(), userId);
+            List<HomeworkPictureCheckDto> homeworkPictures = kmtCorrectSysService.findCheckHomeworkPictureList(req.getHomeworkId(), req.getTeacherId());
             Map<String, Object> data = new HashMap<>();
             data.put("homeworkPictures", homeworkPictures);
             responseEntity.success(data, "请求成功");
@@ -92,7 +92,7 @@ public class ApiManagerTeacherQualityController extends BaseController {
     @ModifySecurity
     @RequestMapping(value = "/correctCheck", method = RequestMethod.POST)
     @ApiOperation(value = "提交质检结果", httpMethod = "POST", notes = "提交质检结果")
-    public ResponseEntity correctCheck(@RequestParam(name = "accessToken") String accessToken, @RequestBody CorrectCheckInspectorReq 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

@@ -786,7 +786,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
            }
            sb.append(" GROUP BY ");
            sb.append(" date ");
-           sb.append(" ORDER BY date ");
+           sb.append(" ORDER BY date desc");
            return dao.findPage(sb.toString(), queryparams.toArray(),pageable);
   	}
     
@@ -795,7 +795,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.SUBJECT,	t2.grade,	date( t1.create_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,	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    ");
@@ -829,7 +829,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 ");
+         sb.append(" ORDER BY date desc ");
          return dao.findList(sb.toString(), queryparams.toArray(), HomeworkCheckDto.class);
 	}
     

src/main/java/com/ssj/service/conch/schoolmaster/util/Constant.java

@@ -40,6 +40,12 @@ public class Constant {
      * tb_lib_manager中线上老师，和kmt 的老师
      */
     public static final int KMT_122_TEACHER_TYPE = 8;
+    
+    /**
+        * 批改老师
+     */
+    public static final int HOMEWORK_30_TEACHER_TYPE = 30;
+    
 
     /**
      * tb_lib_manager小课老师的type

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

@@ -44,7 +44,7 @@ import com.ssj.service.kmt.correctsys.dto.HomeworkExerciseQuestionsDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkPictureCheckDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkPictureCheckHowDetailDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkPictureDto;
-import com.ssj.service.kmt.correctsys.request.CorrectCheckInspectorReq;
+import com.ssj.service.kmt.correctsys.request.CorrectCheckReq;
 import com.ssj.service.kmt.correctsys.service.KmtCorrectSysService;
 import com.ssj.service.kmt.dto.ExerciseQuestionAnswer4CorrectDTO;
 import com.ssj.service.kmt.dto.ExerciseQuestionAnswerDto;
@@ -99,7 +99,13 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 
     @Override
     public List<HomeworkPictureCheckDto> findCheckHomeworkPictureList(String homeworkId, String teacherId) {
-        List<HomeworkPictureCheckDto> result = this.findCorrectCheckHomeworkPictureList(homeworkId, 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);
+        }
         return result;
     }
 
@@ -365,6 +371,9 @@ 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);
@@ -579,9 +588,9 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
     }
 
     @Override
-    public ResponseEntity correctCheck(CorrectCheckInspectorReq req, String userId) {
+    public ResponseEntity correctCheck(CorrectCheckReq req, String userId) {
         ResponseEntity responseEntity = new ResponseEntity();
-        int teacherType = 30;
+        int teacherType = req.getTeacherType();
         Date now = new Date();
 
         //如果是模糊图片
@@ -598,9 +607,18 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         HomeworkPicture homeworkPicture = homeworkPictureService.getById(req.getHomeworkPicId());
 
         //校验作业是否已批改
-        if (homeworkPicture.getIsFeedback() == 0 && (homeworkPicture.getIsMark() == 0 || homeworkPicture.getIsMark() == 2)) {
-            responseEntity.success(ResponseConstant.CODE_000, "作业未批改，不能质检");
-            return responseEntity;
+        if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
+            if (homeworkPicture.getIsFeedback() == 0 && (homeworkPicture.getIsMark() == 0 || homeworkPicture.getIsMark() == 2)) {
+                responseEntity.success(ResponseConstant.CODE_000, "作业未批改，不能质检");
+                return responseEntity;
+            }
+        }
+        //校验作业是否已匹配
+        if (teacherType == Constant.CORRECT_KNOW_TYPE) {
+            if (homeworkPicture.getIsKnowFeedback() == 0 && homeworkPicture.getIsNeedingKnow() == 1) {
+                responseEntity.success(ResponseConstant.CODE_000, "作业有改动，不能质检");
+                return responseEntity;
+            }
         }
 
         //作业已经报错，不能再质检通过
@@ -612,7 +630,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         //批改错误
         if (req.getType() == 2) {
             homeworkPictureCorrect.setIsCheckError(1);
-            //homeworkPictureCorrect.setErrorReason(req.getReason());
+            homeworkPictureCorrect.setErrorReason(req.getReason());
         }
         //设置结束质检时间
         homeworkPictureCorrect.setCheckEndTime(now);
@@ -624,6 +642,12 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
             //质检员userId
             homeworkPictureCorrect.setCheckerId(manager.getUserId());
             switch (manager.getType()) {
+                case 11:
+                    homeworkPictureCorrect.setChecker("学习管理员");
+                    break;
+                case 12:
+                    homeworkPictureCorrect.setChecker("超级管理员");
+                    break;
                 case 50:
                     homeworkPictureCorrect.setChecker(manager.getName());
                     break;
@@ -637,24 +661,35 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         this.saveErrorCheckRecord(homeworkPictureCorrect, homeworkPicture, teacherType, checkedUserId);
         homeworkPictureCorrectService.save(homeworkPictureCorrect);
         //批改老师的质检设置为已质检
-        homeworkPicture.setIsCorrect(13);
-        
+        if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
+            homeworkPicture.setIsCorrect(13);
+        }
         homeworkPictureService.save(homeworkPicture);
 
         if (req.getType() == 2) {
             //批改错误，给批改老师发送报错提醒
             TbLibManager correctTeacher = null;
-            List<TbLibManager> libManagerList =
-                    managerService.findByUserIdAndTypeIn(homeworkPicture.getTeacherId(), new int[]{30});
-            if (CollectionUtils.isNotEmpty(libManagerList)) {
-                correctTeacher = libManagerList.get(0);
-                String content = correctTeacher.getName() + "老师，您有一份新的作业报错提醒，赶快来查看。";
-                sconXingeService.asynPushThreadTask(homeworkPicture.getTeacherId(), 4,
-                        XinGePushMessageTypeEnum.Message.getCode(),
-                        XinGePushBusinessTypeEnum.ErrorWarnNotice.getCode(),
-                        "报错提醒", content, "APP_TEACHER", PushConstants.PUSH_OTHER);
+            if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
+                List<TbLibManager> libManagerList =
+                        managerService.findByUserIdAndTypeIn(homeworkPicture.getTeacherId(), new int[]{8, 11});
+                if (CollectionUtils.isNotEmpty(libManagerList)) {
+                    correctTeacher = libManagerList.get(0);
+                    String content = correctTeacher.getName() + "老师，您有一份新的作业报错提醒，赶快来查看。";
+                    sconXingeService.asynPushThreadTask(homeworkPicture.getTeacherId(), 4,
+                            XinGePushMessageTypeEnum.Message.getCode(),
+                            XinGePushBusinessTypeEnum.ErrorWarnNotice.getCode(),
+                            "报错提醒", content, "APP_TEACHER", PushConstants.PUSH_OTHER);
+                }
+            } else {
+                correctTeacher = managerService.findByUserIdAndType(homeworkPicture.getKnowTeacherId(), 13);
+                if (correctTeacher != null) {
+                    String content = correctTeacher.getName() + "老师，您有一份新的作业报错提醒，赶快来查看。";
+                    sconXingeService.asynPushThreadTask(homeworkPicture.getKnowTeacherId(), 4,
+                            XinGePushMessageTypeEnum.Message.getCode(),
+                            XinGePushBusinessTypeEnum.ErrorWarnNotice.getCode(),
+                            "报错提醒", content, "APP_TEACHER", PushConstants.PUSH_OTHER);
+                }
             }
-            
         }
         return responseEntity.success("成功");
     }
@@ -665,35 +700,48 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
      * @param homeworkPictureCorrect
      * @param homeworkPicture
      */
-    private void saveErrorCheckRecord(HomeworkPictureCorrect homeworkPictureCorrect, HomeworkPicture homeworkPicture,
-                                      int teacherType1, String checkedUserId) {
-        if (homeworkPictureCorrect.getIsCheckError() == 1) {
-            HomeworkPictureErrorCheck errorCheck = new HomeworkPictureErrorCheck();
-            errorCheck.setHomeworkPictureId(homeworkPicture.getId());
-            errorCheck.setChecker(homeworkPictureCorrect.getChecker());
-            errorCheck.setCreateTime(new Date());
-            errorCheck.setStartTime(homeworkPictureCorrect.getStartTime());
-            errorCheck.setEndTime(homeworkPictureCorrect.getEndTime());
-            errorCheck.setErrorReason(homeworkPictureCorrect.getErrorReason());
-            errorCheck.setType(homeworkPictureCorrect.getType());
-            if (StringUtil.isBlank(checkedUserId)) {
-                   errorCheck.setCheckedUserId(homeworkPicture.getTeacherId());
-            } else {
-                errorCheck.setCheckedUserId(checkedUserId);
-            }
-            //标注图片问题
-            SconTeacherCorrectRecord sconTeacherCorrectRecord =
-                    sconTeacherCorrectRecordService.findByHomeworkPictureId(homeworkPicture.getId());
-            if (sconTeacherCorrectRecord != null && StringUtils.isNotBlank(sconTeacherCorrectRecord.getCorrected_picture_url())) {
-                errorCheck.setCheckPictureUrl(sconTeacherCorrectRecord.getCorrected_picture_url());
-            } else {
-                errorCheck.setCheckPictureUrl(StringUtils.isEmpty(homeworkPicture.getCorrectedPictureUrl())
-                        ? homeworkPicture.getFileKey() : homeworkPicture.getCorrectedPictureUrl());
-            }
-           
-            homeworkPictureErrorCheckService.save(errorCheck);
-        }
-    }
+	private void saveErrorCheckRecord(HomeworkPictureCorrect homeworkPictureCorrect, HomeworkPicture homeworkPicture,
+			int teacherType, String checkedUserId) {
+		if (homeworkPictureCorrect.getIsCheckError() == 1) {
+			HomeworkPictureErrorCheck errorCheck = new HomeworkPictureErrorCheck();
+			errorCheck.setHomeworkPictureId(homeworkPicture.getId());
+			errorCheck.setChecker(homeworkPictureCorrect.getChecker());
+			errorCheck.setCreateTime(new Date());
+			errorCheck.setStartTime(homeworkPictureCorrect.getStartTime());
+			errorCheck.setEndTime(homeworkPictureCorrect.getEndTime());
+			errorCheck.setErrorReason(homeworkPictureCorrect.getErrorReason());
+			errorCheck.setType(homeworkPictureCorrect.getType());
+			if (StringUtil.isBlank(checkedUserId)) {
+				if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
+					errorCheck.setCheckedUserId(homeworkPicture.getTeacherId());
+				} else {
+					errorCheck.setCheckedUserId(homeworkPicture.getKnowTeacherId());
+				}
+			} else {
+				errorCheck.setCheckedUserId(checkedUserId);
+			}
+			//标注图片问题
+			SconTeacherCorrectRecord sconTeacherCorrectRecord = sconTeacherCorrectRecordService
+					.findByHomeworkPictureId(homeworkPicture.getId());
+			if (sconTeacherCorrectRecord != null
+					&& StringUtils.isNotBlank(sconTeacherCorrectRecord.getCorrected_picture_url())
+					&& teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
+				errorCheck.setCheckPictureUrl(sconTeacherCorrectRecord.getCorrected_picture_url());
+			} else {
+				errorCheck.setCheckPictureUrl(
+						StringUtils.isEmpty(homeworkPicture.getCorrectedPictureUrl()) ? homeworkPicture.getFileKey()
+								: homeworkPicture.getCorrectedPictureUrl());
+			}
+			if (teacherType == Constant.CORRECT_KNOW_TYPE) {
+				List<HomeworkCheckKnowDetailDto> homeworkCheckKnowDetailDtos = correctSysQueryDao
+						.findHomeworkCorrectedKnowledgeByPictureId(homeworkPicture.getId());
+				HomeworkPictureCheckHowDetailDto homeworkPictureCheckHowDetailDto = this
+						.getHomeworkPictureKnowCheckData(homeworkPicture, homeworkCheckKnowDetailDtos);
+				errorCheck.setErrorHowDetails(JSON.toJSONString(homeworkPictureCheckHowDetailDto));
+			}
+			homeworkPictureErrorCheckService.save(errorCheck);
+		}
+	}
     
     
     @Override

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

@@ -9,6 +9,8 @@ public class HomeworkCheckDto implements Serializable {
     private String childName;
 
     private String homeworkId;
+    
+    private String teacherId;
 
     private String subject;
 
@@ -85,4 +87,15 @@ public class HomeworkCheckDto implements Serializable {
     public void setTotal(Integer total) {
         this.total = total;
     }
+
+	public String getTeacherId() {
+		return teacherId;
+	}
+
+	public void setTeacherId(String teacherId) {
+		this.teacherId = teacherId;
+	}
+    
+    
+    
 }

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

@@ -17,8 +17,8 @@ public class CorrectCheckReq extends BaseRequest {
     private String reason;
     @ApiModelProperty(name = "type", value = "1:通过，2：批改错误", required = true)
     private int type;
-    @ApiModelProperty(name = "teacherType", value = "8:批改老师 13：匹配知识点老师", required = true)
-    private int teacherType = 8;
+    @ApiModelProperty(name = "teacherType", value = "30:批改老师 ", required = true)
+    private int teacherType = 30;
 
     public String getHomeworkPicId() {
         return homeworkPicId;

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

@@ -13,11 +13,11 @@ public class TeacherAllotReq extends BaseRequest {
 
     @ApiModelProperty(name = "homeworkId", value = "作业id", required = true)
     private String homeworkId;
-    @ApiModelProperty(name = "teacherId", value = "老师id", required = true)
+    @ApiModelProperty(name = "teacherId", value = "老师id", required = false )
     private String teacherId;
-    @ApiModelProperty(name="originTeacherId",value = "原作业老师id",required = true)
+    @ApiModelProperty(name="originTeacherId",value = "原作业老师id",required = false)
     private  String originTeacherId;
-    @ApiModelProperty(name="type",value = "老师类型（8:批改老师；13：匹配知识点老师）",required = true)
+    @ApiModelProperty(name="type",value = "老师类型（30:批改老师）",required = true)
     private  int type;
 
     public int getType() {

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

@@ -13,7 +13,6 @@ import com.ssj.service.kmt.correctsys.dto.HomeworkCheckKnowDetailDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkCheckSubjectDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkPictureCheckDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkPictureCheckHowDetailDto;
-import com.ssj.service.kmt.correctsys.request.CorrectCheckInspectorReq;
 import com.ssj.service.kmt.correctsys.request.CorrectCheckReq;
 
 /**
@@ -63,7 +62,7 @@ public interface KmtCorrectSysService {
      * @return
      * @throws Exception
      */
-    ResponseEntity correctCheck(CorrectCheckInspectorReq req, String userId) throws Exception;
+    ResponseEntity correctCheck(CorrectCheckReq req, String userId) throws Exception;
     
 
     /**

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

@@ -178,6 +178,6 @@ public class HomeworkPictureServiceImpl extends BaseServiceImpl<HomeworkPicture,
 
 	@Override
 	public List<HomeworkPictureDto> findCheckHomeworkPictureByHomeworkId(String homeworkId) {
-		 return homeworkPictureQueryDao.findCheckPictureByHomeworkId(8, homeworkId);
+		 return homeworkPictureQueryDao.findCheckPictureByHomeworkId(30, homeworkId);
 	}
 }