|
@@ -40,14 +40,14 @@ public class ReviewJobService {
|
|
|
return jobDao.findJobs();
|
|
|
}
|
|
|
|
|
|
- public JSONObject uploadJob(String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution){
|
|
|
+ public JSONObject uploadJob(String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution,boolean isCrossValidation,int validationNum){
|
|
|
JSONObject jsonObject=new JSONObject();
|
|
|
String checkResult=checkJobDistribution(workerDistribution);
|
|
|
if(!checkResult.equals("success")){
|
|
|
jsonObject.put("status","fail");
|
|
|
jsonObject.put("message",checkResult);
|
|
|
}
|
|
|
- ReviewJob reviewJob=new ReviewJob(examId,caseId,name,description,Long.toString(System.currentTimeMillis()),paperId,startTime,endTime,"");
|
|
|
+ ReviewJob reviewJob=new ReviewJob(examId,caseId,name,description,Long.toString(System.currentTimeMillis()),paperId,startTime,endTime,"",isCrossValidation,validationNum);
|
|
|
String jobId=jobDao.save(reviewJob);
|
|
|
if(workerDistribution.equals("")){
|
|
|
List<String>workerIds=new ArrayList<>();
|
|
@@ -134,7 +134,7 @@ public class ReviewJobService {
|
|
|
for(int i=0;i<reports.size();i++){
|
|
|
reportIds.add(reports.get(i).getId());
|
|
|
}
|
|
|
- JSONObject jsonObject=uploadJob(examId,caseId,jobName,jobDescription,paperId,startTime,endTime,workerList,"");
|
|
|
+ JSONObject jsonObject=uploadJob(examId,caseId,jobName,jobDescription,paperId,startTime,endTime,workerList,"",false,0);
|
|
|
// groupDao.save(new ReviewGroup("default","",workerList,jobId,reportIds));
|
|
|
if(jsonObject.getString("status").equals("success")) {
|
|
|
messageVO.setStatus("200");
|
|
@@ -151,13 +151,15 @@ public class ReviewJobService {
|
|
|
return messageVO;
|
|
|
}
|
|
|
|
|
|
- public boolean updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,List<String>workerList,String workerDistribution){
|
|
|
+ public boolean updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,List<String>workerList,String workerDistribution,boolean isCrossValidation,int validationNum){
|
|
|
try {
|
|
|
ReviewJob reviewJob=jobDao.findJob(jobId);
|
|
|
reviewJob.setName(name);
|
|
|
reviewJob.setDescription(description);
|
|
|
reviewJob.setStart_time(startTime);
|
|
|
reviewJob.setEnd_time(endTime);
|
|
|
+ reviewJob.setCrossValidation(isCrossValidation);
|
|
|
+ reviewJob.setValidationNum(validationNum);
|
|
|
jobDao.save(reviewJob);
|
|
|
deleteJob(jobId);
|
|
|
List<String>workerIds=new ArrayList<>();
|