|
@@ -51,8 +51,8 @@ public class AdminQuestionSubmitController {
|
|
*/
|
|
*/
|
|
/*@RequiresPermissions("admin:adminQuestionnaireRecord:view")*/
|
|
/*@RequiresPermissions("admin:adminQuestionnaireRecord:view")*/
|
|
@RequestMapping(value = {"list1", ""})
|
|
@RequestMapping(value = {"list1", ""})
|
|
- @ResponseBody
|
|
|
|
- public AdminQuestionnaireSurvey list1(String questionnaireSurveyId, Model model) {
|
|
|
|
|
|
+// @ResponseBody
|
|
|
|
+ public String list1(String questionnaireSurveyId, Model model) {
|
|
|
|
|
|
//根据问卷调查ID--->查询问卷调查项表
|
|
//根据问卷调查ID--->查询问卷调查项表
|
|
List<AdminQuestionItem> adminQuestionItems = adminQuestionItemService.selectQItemList(questionnaireSurveyId);
|
|
List<AdminQuestionItem> adminQuestionItems = adminQuestionItemService.selectQItemList(questionnaireSurveyId);
|
|
@@ -71,9 +71,10 @@ public class AdminQuestionSubmitController {
|
|
|
|
|
|
adminQuestionnaireSurvey1.setAdminQuestionItemList(adminQuestionItems);
|
|
adminQuestionnaireSurvey1.setAdminQuestionItemList(adminQuestionItems);
|
|
|
|
|
|
- return adminQuestionnaireSurvey1;
|
|
|
|
|
|
+ model.addAttribute("adminQuestionnaireSurvey1", adminQuestionnaireSurvey1);
|
|
|
|
|
|
- /*model.addAttribute("adminQuestionnaireRecord", null);
|
|
|
|
- return "modules/admin/wenjuan/......";*/
|
|
|
|
|
|
+// return adminQuestionnaireSurvey1;
|
|
|
|
+
|
|
|
|
+ return "modules/admin/wenjuan/demo";
|
|
}
|
|
}
|
|
}
|
|
}
|