|
@ -996,7 +996,7 @@ public class ManagerQuestionnaireService extends BaseService {
|
|
|
}
|
|
|
}
|
|
|
map.put("title", title);
|
|
|
map.put("templateID", code);
|
|
|
map.put("templateId", code);
|
|
|
map.put("comment", comment);
|
|
|
map.put("label", tags);
|
|
|
list.add(map);
|
|
@ -1078,14 +1078,16 @@ public class ManagerQuestionnaireService extends BaseService {
|
|
|
String conetent = option.getContent();
|
|
|
int haveComment = option.getHaveComment();
|
|
|
int required = option.getIsRequired();
|
|
|
int optsort = option.getSort();
|
|
|
if (!StringUtils.isEmpty(option.getQuestionCodeNext())) {
|
|
|
String next = option.getQuestionCodeNext();
|
|
|
SurveyTemplateQuestions tempQst = surveyTemplateQuestionsDao.findById(id, next);
|
|
|
// opt.put("nextQuestion", tempQst.getSort());
|
|
|
opt.put("nextQuestion", tempQst.getSort());
|
|
|
}
|
|
|
|
|
|
opt.put("isRequired", required);
|
|
|
opt.put("content", conetent);
|
|
|
opt.put("sort", optsort);
|
|
|
opt.put("haveComment", haveComment);
|
|
|
optList.add(opt);
|
|
|
}
|
|
@ -1099,7 +1101,7 @@ public class ManagerQuestionnaireService extends BaseService {
|
|
|
if (!StringUtils.isEmpty(questionnair.getQuestionCodeNext())) {
|
|
|
String next = questionnair.getQuestionCodeNext();
|
|
|
SurveyTemplateQuestions tempQst = surveyTemplateQuestionsDao.findById(id, next);
|
|
|
// question.put("nextQuestion", tempQst.getSort());
|
|
|
question.put("nextQuestion", tempQst.getSort());
|
|
|
}
|
|
|
questions.add(question);
|
|
|
}
|