|
|
@@ -239,14 +239,18 @@ public class CaseLogicImpl implements CaseLogic {
|
|
|
continue;
|
|
|
}
|
|
|
long caseid = caseBlock.getCaseIds().get(0);
|
|
|
- CaseExtendsVO caseExtendsVO = Converter.convert(CaseExtendsVO.class, caseService.getCaseExtendsById(caseid));
|
|
|
+ CaseExtends caseExtends=caseService.getCaseExtendsById(caseid);
|
|
|
+ CaseExtendsVO caseExtendsVO = Converter.convert(CaseExtendsVO.class, caseExtends);
|
|
|
caseExtendsVO.setTaskId(examId);
|
|
|
+ App app=targetService.findById(caseExtends.getAppId());
|
|
|
+ caseExtendsVO.setTargetType(app.getTargetType());
|
|
|
+ if(app.getTargetType()==TargetTypeConstants.KIBUG)
|
|
|
+ caseExtendsVO.setAppLocation(applicationService.getAppById(caseExtendsVO.getTargetId()).getAppLocation());
|
|
|
if (isWorker == true && (caseExtendsVO.getAnswerWay() == AnswerWayConstants.DEV_ECLIPSE || caseExtendsVO.getAnswerWay() == AnswerWayConstants.APP_ECLIPSE || caseExtendsVO.getAnswerWay() == AnswerWayConstants.WEB_ECLIPSE)){
|
|
|
caseExtendsVO.setSecret(indexService.getSecret(userId, examId));
|
|
|
caseExtendsVO.setSubmitted(assignedTaskService.isSubmitted(examId,userId,caseExtendsVO.getId(),caseExtendsVO.getCaseId()));
|
|
|
}
|
|
|
if (caseExtendsVO.getAnswerWay() == AnswerWayConstants.REPORT) {
|
|
|
- caseExtendsVO.setAppLocation(applicationService.getAppById(caseExtendsVO.getTargetId()).getAppLocation());
|
|
|
Report report = reportService.getReport(examId, caseid, userId);
|
|
|
if (report != null)
|
|
|
caseExtendsVO.setReportId(report.getId());
|