update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -214,8 +214,8 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
     @Query("select distinct m.subjectCode from ExamStudent m where m.examId=?1 and m.college=?2 ")
     public List<String> findDistinctSubjectCodeByCollege(int examId, String college);
 
-    @Query("select min(s.inspectCount) from ExamStudent s where s.examId=?1 and s.subjectCode=?2 ")
-    public Integer findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode);
+    @Query("select min(s.inspectCount) from ExamStudent s where s.examId=?1 and s.subjectCode=?2  and s.upload=true and s.absent=false and s.breach=false ")
+    public int findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode);
 
     @Modifying
     @Query("update ExamStudent s set s.inspectCount=?2 where s.id=?1 ")

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/InspectHistoryDao.java

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.biz.exam.dao;
 
 import java.util.List;
 
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -10,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 import cn.com.qmth.stmms.biz.exam.model.InspectHistory;
 
 public interface InspectHistoryDao extends PagingAndSortingRepository<InspectHistory, Integer>,
-        JpaSpecificationExecutor<InspectHistory> {
+        JpaSpecificationExecutor<InspectHistory>, JpaRepository<InspectHistory, Integer> {
 
     @Query(value = "select * from eb_inspect_history s where s.student_id=?1 order by s.inspect_time desc limit ?2 ", nativeQuery = true)
     List<InspectHistory> findByStudentIdLimit3(int studentId, int count);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ExamStudentService.java

@@ -160,7 +160,7 @@ public interface ExamStudentService {
 
     public List<String> findDistinctSubjectCodeByCollege(int examId, String college);
 
-    public Integer findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode);
+    public int findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode);
 
     public void updateInspectCount(Integer studentId, Integer inspectCount);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -1135,7 +1135,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     }
 
     @Override
-    public Integer findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode) {
+    public int findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode) {
         return studentDao.findMinInspectCountByExamIdAndSubjectCode(examId, subjectCode);
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectHistoryServiceImpl.java

@@ -23,7 +23,7 @@ public class InspectHistoryServiceImpl extends BaseQueryService<InspectHistory>
 
     @Override
     public InspectHistory save(InspectHistory i) {
-        return inspectHistoryDao.save(i);
+        return inspectHistoryDao.saveAndFlush(i);
     }
 
     @Override

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -158,8 +158,8 @@ public class PaperController extends BaseExamController {
     @Autowired
     private AnswerCardService answerCardService;
 
-    @Value("${file.store}")
-    private String fileStore;
+    @Value("${file.temp}")
+    private String tempFile;
 
     @Logging(menu = "试卷管理查询", type = LogType.QUERY)
     @RequestMapping
@@ -838,7 +838,7 @@ public class PaperController extends BaseExamController {
         List<String> error = new ArrayList<String>();
         try {
             byte[] data = IOUtils.toByteArray(file.getInputStream());
-            File target = new File(fileStore + File.separator + "temp.zip");
+            File target = new File(tempFile + File.separator + "temp.zip");
             target.getParentFile().mkdirs();
             FileOutputStream ous = new FileOutputStream(target);
             ous.write(data);

stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -7,6 +7,7 @@ jdbc.maxActive=50
 jdbc.initSize=5
 ##\u6587\u4ef6\u5b58\u50a8\u914d\u7f6e
 file.store=/Users/ting.yin/work/static/stmms-ft
+file.temp=/Users/ting.yin/work/static/stmms-ft
 ##\u88c1\u5207\u56fe\u9ed8\u8ba4\u5207\u5272\u89c4\u5219
 slice.split.config=0,0.55,0.45,0.55
 ##\u9ed8\u8ba4\u95ee\u9898\u5377\u7c7b\u578b