修改查看评分数据3

ynexam-admin/src/main/java/com/xhm/web/controller/api/openapi/ScoreController.java

@@ -42,9 +42,12 @@ public class ScoreController extends Result {
             int i = interviewScoreService.insertInterviewScore(submitDTO);
             if(i == 1){
                 return Result.suc();
+            } else if(i == 5){
+                return Result.fail(ResultCode.MARK);
             } else {
                 return Result.fail(ResultCode.FAIL);
             }
+
         }catch (RuntimeException e){
             return Result.fail(201,e.getMessage());
         }

ynexam-admin/src/main/java/com/xhm/web/controller/ynedu/BeginController.java

@@ -12,6 +12,7 @@ import com.xhm.ynedu.dto.PutExamionerDTO;
 import com.xhm.ynedu.service.IYnBeginService;
 import com.xhm.ynedu.vo.GatherVO;
 import com.xhm.ynedu.vo.QueryScoreVO;
+import com.xhm.ynedu.vo.YnExamineeLeadVO;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -218,6 +219,16 @@ public class BeginController {
         List<YnExaminer> list = beginService.listAssociate(putExamionerDTO);
         return AjaxResult.success(list);
     }
+    /**
+     * 查询考场历史考生评分
+     */
+    @GetMapping("/historyScores")
+    public AjaxResult historyScores( )
+    {
+        List<YnExamineeLead> examineeLeads = beginService.historyScores();
+
+        return AjaxResult.success(examineeLeads);
+    }
 
 
 

ynexam-common/src/main/java/com/xhm/common/general/ResultCode.java

@@ -9,6 +9,9 @@ public enum ResultCode {
     /* 失败状态码 */
     FAIL(0, "失败"),
 
+    /* 失败状态码 */
+    MARK(201, "不是该岗位考官，不能评分！"),
+
     /* 系统500错误*/
     SYSTEM_ERROR(10000, "系统异常，请稍后重试"),
     UNAUTHORIZED(10401, "签名验证失败"),

ynexam-ynedu/src/main/java/com/xhm/ynedu/service/IYnBeginService.java

@@ -79,6 +79,13 @@ public interface IYnBeginService {
      */
     List<YnExaminer> listAssociate(PutExamionerDTO putExamionerDTO);
 
+
+    /**
+     * 查询历史考生评分信息列表
+     * @return
+     */
+    List<YnExamineeLead> historyScores( );
+
     /**
      * 查询是否可以打印考官信息
      */

ynexam-ynedu/src/main/java/com/xhm/ynedu/service/impl/YnBeginServiceImpl.java

@@ -87,6 +87,17 @@ public class YnBeginServiceImpl implements IYnBeginService {
         return ynExaminers;
     }
 
+    /**
+     * 查询考场历史考生评分
+     * @return
+     */
+    @Override
+    public List<YnExamineeLead> historyScores() {
+        YnExamineeLead examineeLead = new YnExamineeLead();
+        examineeLead.setState(5);
+        return examineeLeadMapper.selectYnExamineeLeadList(examineeLead);
+    }
+
     /**
      * 查询是否可以打印考官信息
      */

ynexam-ynedu/src/main/java/com/xhm/ynedu/service/impl/YnInterviewScoreServiceImpl.java

@@ -120,7 +120,7 @@ public class YnInterviewScoreServiceImpl implements IYnInterviewScoreService {
         }
         //没有评分权限
        if(q == 0){
-           return i;
+           return 5;
        }
 
         //判断有无考官id

ynexam-ynedu/src/main/java/com/xhm/ynedu/service/impl/YnSubjectServiceImpl.java

@@ -12,6 +12,7 @@ import com.xhm.ynedu.domain.YnInterviewScore;
 import com.xhm.ynedu.mapper.YnExamineeLeadMapper;
 import com.xhm.ynedu.mapper.YnExaminerLeadMapper;
 import com.xhm.ynedu.mapper.YnInterviewScoreMapper;
+import com.xhm.ynedu.service.IYnExamineeLeadService;
 import com.xhm.ynedu.vo.SubjectVO;
 import com.xhm.ynedu.vo.YnSubjectVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,6 +155,12 @@ public class YnSubjectServiceImpl implements IYnSubjectService {
                                     break;
                                 }
                             }
+                            if(i == examineeLeads1.size()- 1){
+                                if (examineeLeads1.get(i).getState() == 3) {
+                                    a = 3;
+                                    break;
+                                }
+                            }
 
                         }
                     }
@@ -218,6 +225,7 @@ public class YnSubjectServiceImpl implements IYnSubjectService {
                                 }
                                     else{
                                         //
+                                        ynSubjectVO.setState(true);
                                         ynSubjectVO.setLastOne(true);
                                         System.out.println("考生的最后一个考生");
                                         break;
@@ -324,6 +332,7 @@ public class YnSubjectServiceImpl implements IYnSubjectService {
                                 }
                                 else{
                                     //
+                                    ynSubjectVO.setState(true);
                                     ynSubjectVO.setLastOne(true);
                                     System.out.println("考生的最后一个考生");
                                     break;
@@ -392,7 +401,11 @@ public class YnSubjectServiceImpl implements IYnSubjectService {
                     break;
             }
         }
-
+        //判断是否考试结束
+        int i2 = selectExamineeLead();
+        if(i2 == 3){
+            ynSubjectVO.setState(true);
+        }
         return ynSubjectVO;
     }
     //查询评分项目
@@ -407,6 +420,31 @@ public class YnSubjectServiceImpl implements IYnSubjectService {
 
 
     }
+    //查询是否结束考试
+    public int selectExamineeLead() {
+        int num = 1;
+        int a = 0;
+        List<YnExamineeLead> list = examineeLeadMapper.selectYnExamineeLeadList(null);
+        for (YnExamineeLead ynExamineeLead : list) {
+            Integer state = ynExamineeLead.getState();
+            if(state.equals(1)){
+                num = 1;
+            }
+            if(state.equals(2) ){
+                num = 2;
+                break;
+            }
+            if(state.equals(5) || state.equals(3) ){
+                a++;
+                if(a == list.size()){
+                    num = 3;
+                }
+            }
+
+        }
+        return num;
+
+    }
 
 
 

ynexam-ynedu/src/main/java/com/xhm/ynedu/vo/YnSubjectVO.java

@@ -61,6 +61,9 @@ public class YnSubjectVO {
     /** 评分状态  */
     @ApiModelProperty(value = "评分状态 1·十分值 2·百分值")
     String score;
+    /** 考场考生结束状态  */
+    @ApiModelProperty(value = "考场考生结束状态")
+    boolean state;
 
 
 }