|
@@ -27,19 +27,21 @@ public class ReviewService {
|
|
ReviewCorrectAnswerDao reviewCorrectAnswerDao;
|
|
ReviewCorrectAnswerDao reviewCorrectAnswerDao;
|
|
|
|
|
|
public ReviewAnswer getAnswerByWorkerReportItem(String reportId,String workerId,String itemId){
|
|
public ReviewAnswer getAnswerByWorkerReportItem(String reportId,String workerId,String itemId){
|
|
- return answerDao.findAnswerByWorkerReportItem(reportId,workerId, itemId);
|
|
|
|
|
|
+ ReviewAnswer reviewAnswer= answerDao.findAnswerByWorkerReportItem(reportId,workerId, itemId);
|
|
|
|
+ if(reviewAnswer==null){
|
|
|
|
+ ReviewWorker reviewWorker=reviewWorkerDao.find(workerId);
|
|
|
|
+ String jobId=reviewWorker.getJob_id();
|
|
|
|
+ String paperId=reviewWorker.getPaper_id();
|
|
|
|
+ reviewAnswer=new ReviewAnswer(itemId,reportId,workerId,jobId,paperId);
|
|
|
|
+ }
|
|
|
|
+ return reviewAnswer;
|
|
}
|
|
}
|
|
|
|
|
|
- public boolean saveAnswer(String itemId, String reportId,String workerId,String paperId, String jobId,List<String>answers,List<String>fileUrl){
|
|
|
|
|
|
+ public boolean saveAnswer(String answerId,List<String>answers,List<String>fileUrl){
|
|
try {
|
|
try {
|
|
- ReviewAnswer reviewAnswer=getAnswerByWorkerReportItem(reportId,workerId,itemId);
|
|
|
|
- if(reviewAnswer==null){
|
|
|
|
- reviewAnswer=new ReviewAnswer(itemId,reportId,answers,workerId,fileUrl,jobId,paperId);
|
|
|
|
- }
|
|
|
|
- else{
|
|
|
|
- reviewAnswer.setAnswers(answers);
|
|
|
|
- reviewAnswer.setFile_url(fileUrl);
|
|
|
|
- }
|
|
|
|
|
|
+ ReviewAnswer reviewAnswer=answerDao.getAnswerById(answerId);
|
|
|
|
+ reviewAnswer.setAnswers(answers);
|
|
|
|
+ reviewAnswer.setFile_url(fileUrl);
|
|
answerDao.save(reviewAnswer);
|
|
answerDao.save(reviewAnswer);
|
|
return true;
|
|
return true;
|
|
} catch(Exception e) {
|
|
} catch(Exception e) {
|