Browse Source

问卷发布页面和代码3

admin 2 years ago
parent
commit
43130dcd5f

+ 0 - 25
web/pom.xml

@@ -84,31 +84,6 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<scope>provided</scope>
 		</dependency> -->
-
-		<!--freemarker-->
-		<dependency>
-			<groupId>org.freemarker</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>2.3.23</version>
-		</dependency>
-
-		<!--<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-freemarker</artifactId>
-			<version>2.5.13</version>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.34</version>
-		</dependency>-->
-
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.3.2</version>
-		</dependency>
 	</dependencies>
 
 	<build>

+ 6 - 5
web/src/main/java/com/jeesite/modules/admin/wenjuan/web/AdminQuestionSubmitController.java

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