美术阅卷10月新增需求-试评BUG修复

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/DataUploadService.java

@@ -346,16 +346,21 @@ public class DataUploadService {
                     }
                     //复制卷子给试评用
                     ExamQuestion questionNew = null;
-                    ExamQuestion isExist = examQuestionRepo.findByWorkIdAndSubjectAndAreaCode(workId, subject, dto.getAreaCode());
+                    ExamQuestion isExist = examQuestionRepo.findByWorkIdAndSubjectAndAreaCodeAndTest(workId, subject, dto.getAreaCode(), TrialEnum.DEFAULT.getId());
                     if (Objects.isNull(isExist)) {
                         throw new Exception("请先上传试卷");
                     } else {
+                        ExamQuestion questionTemp = examQuestionRepo.findByWorkIdAndSubjectAndAreaCodeAndTest(workId, subject, dto.getAreaCode(), TrialEnum.INIT.getId());
                         questionNew = new ExamQuestion();
-                        BeanUtils.copyProperties(isExist, questionNew);
-                        questionNew.setTest(TrialEnum.INIT.getId());
-                        questionNew.setName(new StringBuffer("试评").append(subject.getName()).append(dto.getAreaCode()).toString());
-                        questionNew.setId(null);
-                        examQuestionRepo.save(questionNew);
+                        if (Objects.isNull(questionTemp)) {
+                            BeanUtils.copyProperties(isExist, questionNew);
+                            questionNew.setTest(TrialEnum.INIT.getId());
+                            questionNew.setName(new StringBuffer("试评").append(subject.getName()).append(dto.getAreaCode()).toString());
+                            questionNew.setId(null);
+                            examQuestionRepo.save(questionNew);
+                        } else {
+                            BeanUtils.copyProperties(questionTemp, questionNew);
+                        }
                     }
                     //复制学生给试评用
                     Student studentNew = null;

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/ExamQuestionRepo.java

@@ -23,7 +23,7 @@ public interface ExamQuestionRepo extends JpaRepository<ExamQuestion, Long> {
                                                    Subject subject, String areaCode);
 
     ExamQuestion findByWorkIdAndSubjectAndAreaCodeAndTest(Long workId,
-                                                          Subject subject, String areaCode, String test);
+                                                          Subject subject, String areaCode, int test);
 
     void deleteByWorkId(Long workId);