质检

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 TO_DAYS(hp.create_time)>=TO_DAYS(?) AND TO_DAYS(hp.create_time)<=TO_DAYS(?) ");
+           sb.append(" 		WHERE hp.service_type = 100 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"));
@@ -769,7 +769,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
            sb.append(" 	HAVING");
            sb.append(" 		count( IF( hp.is_feedback = 1 OR hp.is_mark IN ( 1, 3 ), 1, 0 )) = sum( IF( hp.is_feedback = 1 OR hp.is_mark IN ( 1, 3 ), 1, 0 )) ");
            sb.append(" ) t4");
-           sb.append(" LEFT JOIN scon_homework_picture t1 ON t4.homework_id = t1.homework_id  AND t1.service_type = 1 ");
+           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 scon_homework_picture_correct hpc ON t1.id = hpc.homework_picture_id AND hpc.type = 8  ");
            sb.append(" WHERE ");
@@ -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 TO_DAYS(hp.create_time)>=TO_DAYS(?) AND TO_DAYS(hp.create_time)<=TO_DAYS(?) ");
+         sb.append(" 		WHERE hp.service_type = 100 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);
@@ -811,7 +811,7 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
          sb.append(" 	HAVING");
          sb.append(" 		count( IF( hp.is_feedback = 1 OR hp.is_mark IN ( 1, 3 ), 1, 0 )) = sum( IF( hp.is_feedback = 1 OR hp.is_mark IN ( 1, 3 ), 1, 0 )) ");
          sb.append(" ) t4");
-         sb.append(" LEFT JOIN scon_homework_picture t1 ON t4.homework_id = t1.homework_id  AND t1.service_type = 1 ");
+         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  ");
@@ -838,9 +838,9 @@ public class CorrectSysQueryDaoImpl implements CorrectSysQueryDao {
     public List<HomeworkExerciseQuestionsDto> findHomeworkCorrectedQuestions(String homeworkId) {
         StringBuilder sb = new StringBuilder();
         sb.append(" select t1.homework_picture_id, t2.id question_id, t2.big_question_index, t2.small_question_name small_question_index,")
-                .append(" t2.option_answer, t2.answer_json, t1.space_index, t1.type, t1.correct_space_index, t2.book_course_id, t2.num")
+                .append(" t3.answer option_answer, t3.answer_json, t1.space_index, t1.type, t1.correct_space_index, t2.book_course_id, t2.num")
                 .append(" from kmt_homework_wrong_question t1 left join kmt_exercise_questions t2 on t1.question_id=t2.id")
-                .append(" where t1.homework_id=? and t1.is_delete = 0 order by t1.homework_picture_id, t2.num");
+                .append(" LEFT JOIN q_question_info t3 ON t2.id = t3.id  where t1.homework_id=? and t1.is_delete = 0 order by t1.homework_picture_id, t2.num");
         List<Object> params = new ArrayList<>();
         params.add(homeworkId);
         return dao.findList(sb.toString(), params.toArray(), HomeworkExerciseQuestionsDto.class);

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

@@ -598,19 +598,11 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         HomeworkPicture homeworkPicture = homeworkPictureService.getById(req.getHomeworkPicId());
 
         //校验作业是否已批改
-        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;
-            }
+        if (homeworkPicture.getIsFeedback() == 0 && (homeworkPicture.getIsMark() == 0 || homeworkPicture.getIsMark() == 2)) {
+            responseEntity.success(ResponseConstant.CODE_000, "作业未批改，不能质检");
+            return responseEntity;
         }
+       
 
         //作业已经报错，不能再质检通过
         if (req.getType() == 1 && homeworkPictureCorrect.getIsCheckError() == 1){
@@ -652,34 +644,21 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
         this.saveErrorCheckRecord(homeworkPictureCorrect, homeworkPicture, teacherType, checkedUserId);
         homeworkPictureCorrectService.save(homeworkPictureCorrect);
         //批改老师的质检设置为已质检
-        if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
-            homeworkPicture.setIsCorrect(13);
-        }
+        homeworkPicture.setIsCorrect(13);
         homeworkPictureService.save(homeworkPicture);
 
         if (req.getType() == 2) {
             //批改错误，给批改老师发送报错提醒
             TbLibManager correctTeacher = null;
-            if (teacherType == Constant.HOMEWORK_30_TEACHER_TYPE) {
-                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);
-                }
-            } 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);
-                }
+            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);
             }
         }
         return responseEntity.success("成功");
@@ -692,7 +671,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
      * @param homeworkPicture
      */
 	private void saveErrorCheckRecord(HomeworkPictureCorrect homeworkPictureCorrect, HomeworkPicture homeworkPicture,
-			int teacherType, String checkedUserId) {
+			int teacherType1, String checkedUserId) {
 		if (homeworkPictureCorrect.getIsCheckError() == 1) {
 			HomeworkPictureErrorCheck errorCheck = new HomeworkPictureErrorCheck();
 			errorCheck.setHomeworkPictureId(homeworkPicture.getId());
@@ -703,11 +682,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 			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());
-				}
+				errorCheck.setCheckedUserId(homeworkPicture.getTeacherId());
 			} else {
 				errorCheck.setCheckedUserId(checkedUserId);
 			}
@@ -716,20 +691,13 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 					.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);
 		}
 	}

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 = "30:批改老师 ", required = true)
-    private int teacherType = 30;
+    @ApiModelProperty(name = "teacherType", value = "8:批改老师 ", required = true)
+    private int teacherType = 8;
 
     public String getHomeworkPicId() {
         return homeworkPicId;

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

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