|
@@ -43,13 +43,14 @@ public class ReviewJobService {
|
|
public JSONObject uploadJob(String jobId,String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution,boolean isCrossValidation,int validationNum){
|
|
public JSONObject uploadJob(String jobId,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();
|
|
JSONObject jsonObject=new JSONObject();
|
|
String checkResult=checkJobDistribution(workerDistribution);
|
|
String checkResult=checkJobDistribution(workerDistribution);
|
|
|
|
+ ReviewPaper reviewPaper=reviewPaperService.getPaper(paperId);
|
|
if((!workerDistribution.equals(""))&&(!checkResult.equals("success"))){
|
|
if((!workerDistribution.equals(""))&&(!checkResult.equals("success"))){
|
|
jsonObject.put("status","fail");
|
|
jsonObject.put("status","fail");
|
|
jsonObject.put("message",checkResult);
|
|
jsonObject.put("message",checkResult);
|
|
return jsonObject;
|
|
return jsonObject;
|
|
}
|
|
}
|
|
if(jobId.equals("")) {
|
|
if(jobId.equals("")) {
|
|
- ReviewJob newReviewJob = new ReviewJob(examId, caseId, name, description, Long.toString(System.currentTimeMillis()), paperId, startTime, endTime, "", isCrossValidation, validationNum);
|
|
|
|
|
|
+ ReviewJob newReviewJob = new ReviewJob(examId, caseId, name, description, Long.toString(System.currentTimeMillis()), paperId,reviewPaper.getId(), startTime, endTime, "", isCrossValidation, validationNum);
|
|
jobId = jobDao.save(newReviewJob);
|
|
jobId = jobDao.save(newReviewJob);
|
|
}
|
|
}
|
|
if(workerDistribution.equals("")){
|
|
if(workerDistribution.equals("")){
|