yin преди 8 месеца
родител
ревизия
e55252c776

+ 3 - 1
src/main/java/cn/com/qmth/scancentral/service/impl/AnswerCardServiceImpl.java

@@ -156,8 +156,10 @@ public class AnswerCardServiceImpl extends MppServiceImpl<AnswerCardDao, AnswerC
         entity.setRemark(info.getRemark());
         if(cardFile.getAppendix()!=null){
             entity.setDpi(cardFile.getAppendix().getDpi());
-        }else {
+        }else if(info.getDpi()!=null){
             entity.setDpi(info.getDpi());
+        }else{
+            entity.setDpi(150);
         }
         entity.setMd5(info.getMd5());
         this.saveOrUpdateByMultiId(entity);

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/impl/OmrGroupServiceImpl.java

@@ -136,7 +136,7 @@ public class OmrGroupServiceImpl extends ServiceImpl<OmrGroupDao, OmrGroupEntity
             omrGroup.setReseting(
                     !concurrentService.getSemaphore(LockType.OMR_GROUP_RESET + "-" + omrGroup.getId()).isAvailable());
 
-            omrGroup.setFinishCount(taskService.getCountByGroupAndStatus(omrGroup.getId(), TaskStatus.PROCESSED));
+            omrGroup.setFinishCount(taskService.getCountByGroupAndStatus(omrGroup.getId(), TaskStatus.PROCESSED, TaskStatus.ARBITRATED));
             omrGroup.setUnarbitrateCount(
                     taskService.getCountByGroupAndStatus(omrGroup.getId(), TaskStatus.WAIT_ARBITRATE));
             omrGroup.setArbitratedCount(taskService.getCountByGroupAndStatus(omrGroup.getId(), TaskStatus.ARBITRATED));

+ 1 - 1
src/main/resources/mapper/ExamMapper.xml

@@ -11,7 +11,7 @@
 		<if test="query.enable != null">
 			AND t.enable=#{query.enable}
 		</if>
-		order by t.id desc
+		order by t.id asc
 	</select>
 
  	<select id="pageExam" resultType="cn.com.qmth.scancentral.vo.ExamVo">