Forráskód Böngészése

uploadJobByJson每次会删除paper重新上传;修改delReviewGroup时没删掉的bug

MengyangDuan 5 éve
szülő
commit
1f90b3d3fe

+ 1 - 1
src/main/java/edu/nju/dao/ReviewGroupDao.java

@@ -33,7 +33,7 @@ public class ReviewGroupDao {
     public void removeByJob(String jobId){
         Query query = new Query();
         query.addCriteria(Criteria.where("job_id").is(jobId));
-        mongoOperations.remove(query,ReviewJob.class);
+        mongoOperations.remove(query,ReviewGroup.class);
     }
 
     public ReviewGroup getGroupByReports(List<String>reportIds){

+ 4 - 4
src/main/java/edu/nju/model/WorkerVO.java

@@ -7,12 +7,12 @@ public class WorkerVO {
 
     private String school;
 
-    private int grade;
+    private double grade;
 
     public WorkerVO() {
     }
 
-    public WorkerVO(String id, String name, String school,int grade) {
+    public WorkerVO(String id, String name, String school,double grade) {
         this.id = id;
         this.name = name;
         this.school = school;
@@ -43,11 +43,11 @@ public class WorkerVO {
         this.school = school;
     }
 
-    public int getGrade() {
+    public double getGrade() {
         return grade;
     }
 
-    public void setGrade(int grade) {
+    public void setGrade(double grade) {
         this.grade = grade;
     }
 }

+ 10 - 10
src/main/java/edu/nju/service/ReviewJobService.java

@@ -138,17 +138,22 @@ public class ReviewJobService {
         String caseId=jobJsonDTO.getCaseId();
         JSONArray workerList_Array=new JSONArray(jobJsonDTO.getWorker_list());
         String paperUrl=jobJsonDTO.getPaperUrl();
-        System.out.println("基本读取成功");
         List<String>workerList=new ArrayList<>();
         for(int i=0;i<workerList_Array.length();i++){
             workerList.add(String.valueOf(workerList_Array.get(i)));
         }
         MessageVO messageVO=new MessageVO();
+
+        ReviewJob reviewJob=findJobByExamCase(examId,caseId);
+        JSONObject jsonObject=null;
         try {
+            if(reviewJob!=null){
+                reviewPaperService.delPaper(reviewJob.getPaper_id());
+            }
             String paperJson=readStringFromUrl(paperUrl);
             JSONObject paperResult=reviewPaperService.uploadPaper(paperJson);
             System.out.println("paperJson拉成功");
-            if(!paperResult.getString("status").equals("success")){
+            if(!paperResult.getString("status").equals("success")) {
                 messageVO.setStatus("500");
                 messageVO.setMessage("创建paper失败");
                 return messageVO;
@@ -158,17 +163,12 @@ public class ReviewJobService {
             if (examId!=null&&(!examId.equals(""))){
                 crowdSourceToReviewPaperDao.save(new CrowdSourceToReviewPaper(paperId,examId+"-"+caseId,paperUrl));
             }
-            List<ReviewReport>reports=reviewPaperService.getReportsByPaperId(paperId);
-            List<String>reportIds=new ArrayList<>();
-            for(int i=0;i<reports.size();i++){
-                reportIds.add(reports.get(i).getId());
-            }
-            ReviewJob reviewJob=findJobByExamCase(examId,caseId);
-            JSONObject jsonObject=new JSONObject();
+
             if(reviewJob==null) {
                 jsonObject = uploadJob("", examId, caseId, jobName, jobDescription, paperId, startTime, endTime, 0, 0, workerList, "", 0);
             }
-            else {
+            else{
+                reviewPaperService.delPaper(reviewJob.getPaper_id());
                 jsonObject = updateJob(reviewJob.getId(), jobName,jobDescription,paperId,startTime,endTime,0, 0, workerList, "", 0);
             }
             // groupDao.save(new ReviewGroup("default","",workerList,jobId,reportIds));