修改接口

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -236,8 +236,15 @@ public class QuestionnaireCtrl {
     }
 
     @RequestMapping({"downZipByFileId"})
-    public String downZipByFileId(@RequestParam Long optionId, HttpServletResponse response) throws IOException {
-        String forwardName = "/user/file";
+    public String downZipByFileId(@RequestParam Long questionnaireUuid,
+                                  @RequestParam Long optionId,
+                                  @RequestParam(required = false) Long recordId,
+                                  HttpServletRequest request,
+                                  HttpServletResponse response) throws IOException {
+        if(recordId==null) {
+            recordId = this.questionnaireService.selectRecordId(questionnaireUuid,
+                    request.getSession().getAttribute("realID").toString());
+        }
         //1.根据选项查询文件列表
         String forderName = UUIDUtils.getUUID();
         String tempPath = this.getFileUrl();
@@ -248,7 +255,7 @@ public class QuestionnaireCtrl {
         if (!fileForExists.exists()) {
             FileUtil.mkdirFolders(myPath);
         }
-        List<String> fileID = this.fileServer.selectFileId(optionId);
+        List<String> fileID = this.fileServer.selectFileId(optionId,recordId);
         for(int i=0;i<fileID.size();++i) {
             File file = this.fileServer.selectFileByFileID(fileID.get(i));
             try {

src/main/java/com/tiptimes/dao/FileDao.java

@@ -6,6 +6,8 @@
 package com.tiptimes.dao;
 
 import com.tiptimes.model.File;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 public interface FileDao {
@@ -17,5 +19,6 @@ public interface FileDao {
 
   List<String> listFileNameByFileID(String var1);
 
-  List<String> selectFileId(Long optionId);
+  List<String> selectFileId(@Param("optionId") Long optionId,
+                            @Param("recordId")Long recordId);
 }

src/main/java/com/tiptimes/service/FileService.java

@@ -11,7 +11,7 @@ public interface FileService {
   
   String updateFile(String paramString1, String paramString2);
   //根据选项id查询文件对应id
-  List<String> selectFileId(Long optionId);
+  List<String> selectFileId(Long optionId,Long recordId);
 }
 
 

src/main/java/com/tiptimes/service/impl/FileServiceImpl.java

@@ -52,7 +52,7 @@ public class FileServiceImpl implements FileService {
      * @return
      */
     @Override
-    public List<String> selectFileId(Long optionId) {
-        return fileDao.selectFileId(optionId);
+    public List<String> selectFileId(Long optionId,Long recordId) {
+        return fileDao.selectFileId(optionId,recordId);
     }
 }

src/main/resources/mapper/File.xml

@@ -48,6 +48,6 @@
     </select>
 
 	<select id="selectFileId" resultType="java.lang.String">
-		select `value` from t_answer where options_id=#{optionId}
+		select `value` from t_answer where options_id=#{optionId} and record_id =#{recordId}
 	</select>
 </mapper>
\ No newline at end of file