完善修改项目-任务-报告

core/src/main/java/com/mooctest/crowd/domain/domainobject/EvaluationAgency.java

@@ -1,9 +1,5 @@
 package com.mooctest.crowd.domain.domainobject;
 
-import com.mooctest.crowd.domain.exception.CrowdTestProjectNotExistException;
-import com.mooctest.crowd.domain.exception.CrowdTestTaskNoPriceException;
-import com.mooctest.crowd.domain.exception.CrowdTestTaskNotExistException;
-import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import lombok.Data;
 
 import java.sql.Timestamp;
@@ -41,29 +37,29 @@ public class EvaluationAgency extends User {
                 '}';
     }
 
-    @Override
-    public Long getId() {
-        return id;
-    }
-
-    @Override
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public boolean updateCrowdTestTaskStatusByEvaluationAgency(Long projectId, Long taskId, Long evaluationAgencyId, String status) throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException {
-        CrowdTestProjectRepo crowdTestProjectRepo = new CrowdTestProjectRepo();
-        if (crowdTestProjectRepo.getByID(projectId) != null) {
-            CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByID(projectId);
-            CrowdTestTask crowdTestTask = crowdTestProject.getCrowdTestTaskByTaskId(crowdTestProject, taskId);
-            if (crowdTestTask.getQuotedPrice() > 0) {
-                crowdTestTask.setEvaluationAgencyId(evaluationAgencyId);
-                crowdTestTask.setStatus(status);
-                return true;
-            } else {
-                throw new CrowdTestTaskNoPriceException();
-            }
-        }
-        throw new CrowdTestProjectNotExistException();
-    }
+//    @Override
+//    public Long getId() {
+//        return id;
+//    }
+//
+//    @Override
+//    public void setId(Long id) {
+//        this.id = id;
+//    }
+//
+//    public boolean updateCrowdTestTaskStatusByEvaluationAgency(Long projectId, Long taskId, Long evaluationAgencyId, String status) throws CrowdTestProjectNotExistException, CrowdTestTaskNotExistException, CrowdTestTaskNoPriceException {
+//        CrowdTestProjectRepo crowdTestProjectRepo = new CrowdTestProjectRepo();
+//        if (crowdTestProjectRepo.getByID(projectId) != null) {
+//            CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByID(projectId);
+//            CrowdTestTask crowdTestTask = crowdTestProject.getCrowdTestTaskByTaskId(crowdTestProject, taskId);
+//            if (crowdTestTask.getQuotedPrice() > 0) {
+//                crowdTestTask.setEvaluationAgencyId(evaluationAgencyId);
+//                crowdTestTask.setStatus(status);
+//                return true;
+//            } else {
+//                throw new CrowdTestTaskNoPriceException();
+//            }
+//        }
+//        throw new CrowdTestProjectNotExistException();
+//    }
 }

core/src/main/java/com/mooctest/crowd/domain/repository/CrowdTestProjectRepo.java

@@ -217,12 +217,6 @@ public class CrowdTestProjectRepo implements ICrowdTestProjectRepo {
         }
         return crowdTestProjectListResult;
     }
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> 48f657d45fcf8190551f90d780db8239891d3de5
 //    @Override
 //    public List<CrowdTestProject> getByIDList(String[] ids) {
 //        return null;