Merge branch 'dev_1.0.0' of http://git.qmth.com.cn/scan-central/server.git into dev_1.0.0

src/main/java/cn/com/qmth/scancentral/bean/AnswerQueryDomain.java

@@ -17,7 +17,7 @@ public class AnswerQueryDomain extends PagerQuery {
 
     private ExamStatus examStatus;
 
-    private List<String> examNumber;
+    private String examNumber;
 
     private String name;
 
@@ -73,11 +73,11 @@ public class AnswerQueryDomain extends PagerQuery {
         this.status = status;
     }
 
-    public List<String> getExamNumber() {
+    public String getExamNumber() {
         return examNumber;
     }
 
-    public void setExamNumber(List<String> examNumber) {
+    public void setExamNumber(String examNumber) {
         this.examNumber = examNumber;
     }
 

src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java

@@ -1652,16 +1652,31 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     private void resetExamStatus(StudentEntity student, Integer omrExamNumberCount, Integer examNumberFillCount) {
         if (ScanStatus.UNEXIST.equals(student.getStatus())) {
             student.setExamStatus(null);
-        } else if (!student.getQuestionFilled() && student.getSubjectiveFilled()) {
-            student.setExamStatus(ExamStatus.UNCHECK1);
-        } else if (!student.getQuestionFilled() && !student.getSubjectiveFilled()
-                && omrExamNumberCount >= examNumberFillCount) {
-            student.setExamStatus(ExamStatus.UNCHECK2);
-        } else if (!student.getQuestionFilled() && !student.getSubjectiveFilled()
-                && omrExamNumberCount < examNumberFillCount) {
-            student.setExamStatus(ExamStatus.ABSENT);
         } else {
-            student.setExamStatus(ExamStatus.OK);
+            //客观题有作答，不缺考
+            if(student.getQuestionFilled()){
+                student.setExamStatus(ExamStatus.OK);
+            }else {
+                if (student.getSubjectiveFilled()) {
+                    //客观题未作答，主观题有作答，待确认1
+                    student.setExamStatus(ExamStatus.UNCHECK1);
+                } else {
+                    //客观题未作答，主观题未作答，填涂大于10位
+                    if (omrExamNumberCount >= examNumberFillCount) {
+                        if (! "#".equals(student.getPaperType())) {
+                            //客观题未作答，主观题未作答，填涂大于10位，有卷型，待校验2
+                            student.setExamStatus(ExamStatus.UNCHECK2);
+                        }else {
+                            //客观题未作答，主观题未作答，填涂大于10位，无卷型，缺考
+                            student.setExamStatus(ExamStatus.ABSENT);
+                        }
+                    } else {
+                        //客观题未作答，主观题未作答，填涂小于10位，缺考
+                            student.setExamStatus(ExamStatus.ABSENT);
+                    }
+                }
+            }
+
         }
     }
 

src/main/java/cn/com/qmth/scancentral/service/impl/SubjectServiceImpl.java

@@ -533,7 +533,7 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int i = 1; i < list.size(); i++) {
                     String[] ss = list.get(i).split(",");
-                    ret.put(ss[0].trim(), ss[2].trim());
+                    ret.put(ss[1].trim(), ss[3].trim());
                 }
             }
         }
@@ -548,7 +548,7 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int i = 1; i < list.size(); i++) {
                     String[] ss = list.get(i).split(",");
-                    ret.put(ss[0].trim(), ss[2].trim());
+                    ret.put(ss[1].trim(), ss[3].trim());
                 }
             }
         }

src/main/java/cn/com/qmth/scancentral/service/impl/UserServiceImpl.java

@@ -208,7 +208,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         }
 
         // 新增
-        UserEntity userEntity = new UserEntity();
+        UserEntity userEntity =this.getByLoginName(user.getLoginName());
+        if(userEntity!=null){
+            throw new ParameterException("用户已存在");
+        }
+        userEntity = new UserEntity();
         userEntity.setRole(user.getRole());
         userEntity.setLoginName(user.getLoginName());
         userEntity.setName(user.getLoginName());

src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerQueryParam.java

@@ -17,7 +17,7 @@ public class AnswerQueryParam extends PagerQuery {
 
     private List<ExamStatus> examStatus;
 
-    private String examNumber;
+    private List<String> examNumber;
 
     private String name;
 
@@ -75,11 +75,11 @@ public class AnswerQueryParam extends PagerQuery {
         this.status = status;
     }
 
-    public String getExamNumber() {
+    public List<String> getExamNumber() {
         return examNumber;
     }
 
-    public void setExamNumber(String examNumber) {
+    public void setExamNumber(List<String> examNumber) {
         this.examNumber = examNumber;
     }
 

src/main/resources/mapper/StudentMapper.xml

@@ -130,8 +130,12 @@
             </foreach>
         </if>
 
-        <if test="query.examNumber != null and query.examNumber !=''">
-            and t.exam_number=#{query.examNumber}
+        <if test="query.examNumber != null and query.examNumber.size>0">
+            and t.exam_number in
+            <foreach collection="query.examNumber" index="index" item="en"
+                     open="(" separator="," close=")">
+                #{en}
+            </foreach>
         </if>
         <if test="query.name != null and query.name !=''">
             and t.name=#{query.name}
@@ -424,12 +428,8 @@
         <if test="query.examStatus != null">
             and t.exam_status=#{query.examStatus}
         </if>
-        <if test="query.examNumber != null and query.examNumber.size>0">
-            and t.exam_number in
-            <foreach collection="query.examNumber" index="index" item="en"
-                     open="(" separator="," close=")">
-                #{en}
-            </foreach>
+        <if test="query.examNumber != null and query.examNumber !=''">
+            and t.exam_number =#{query.examNumber}
         </if>
         <if test="query.name != null and query.name !=''">
             and t.name=#{query.name}