fix 修改接口

src/main/java/com/ywt/mg/services/enterprise/ApplyProjectService.java

@@ -22,10 +22,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URL;
 import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class ApplyProjectService {
@@ -72,10 +71,18 @@ public class ApplyProjectService {
         try {
             // 1、先根据从前端选择的条件去数据库查找对应的记录
             Map<String, String> item = new HashMap<>();
-            item.put("测试文档测试文档测试文档测试文档.doc", "https://ywt-files.oss-cn-shenzhen.aliyuncs.com//up/marketting_project/public/9-a30e19ed1c8d4b28ba83eb7a88a4f985.doc");
-            item.put("下载.jpg", "https://ywt-files.oss-cn-shenzhen.aliyuncs.com//up/marketting_project/public/9-bb077b3512074ddaae0a12d797f20d02.jpg");
-            item.put("测试文档.pdf", "https://ywt-files.oss-cn-shenzhen.aliyuncs.com//up/marketting_project/public/9-1b9a0a24f2be4cef882a22d1a5750ae5.pdf");
+//            item.put("测试文档测试文档测试文档测试文档.doc", "https://ywt-files.oss-cn-shenzhen.aliyuncs.com//up/marketting_project/public/9-a30e19ed1c8d4b28ba83eb7a88a4f985.doc");
+//            item.put("下载.jpg", "https://ywt-files.oss-cn-shenzhen.aliyuncs.com//up/marketting_project/public/9-bb077b3512074ddaae0a12d797f20d02.jpg");
+//            item.put("测试文档.pdf", "https://ywt-files.oss-cn-shenzhen.aliyuncs.com//up/marketting_project/public/9-1b9a0a24f2be4cef882a22d1a5750ae5.pdf");
 
+            List<MarketingImage> marketingImageList = getMarketingImageList(request);
+            if (Checker.isNone(marketingImageList)){
+                return;
+            }
+            for (int i = 0, j = marketingImageList.size(); i < j; i++) {
+                MarketingImage image = marketingImageList.get(i);
+                item.put(i+"_"+image.getName(), image.getImageUrl());
+            }
             int number = (int) (Math.random() * 1000);
             filePrefix = APPLY_PROJECT_FILE_PATH + number + "/";
             rootPrefix = APPLY_PROJECT_ROOT_PATH + number + "/";
@@ -113,6 +120,44 @@ public class ApplyProjectService {
         }
     }
 
+    private List<MarketingImage> getMarketingImageList(BatchDownloadFilesRequest request) {
+        List<Object> paramList = new ArrayList<>();
+        String whereSql = " ( 1=1 )";
+        whereSql += " and deleted = 0 and (type = 7 or type = 8)";
+        int applyId = Checker.getIntegerValue(request.getId());
+        if (applyId > 0) {
+            whereSql += " and (apply_id = ?)";
+            paramList.add(applyId);
+        }
+
+        String formatDate = "yyyy-MM-dd";
+        SimpleDateFormat format = new SimpleDateFormat(formatDate);
+        try {
+            String createTime = request.getUploadTimeStart();
+            if (!Checker.isNull(createTime)) {
+                whereSql += " and (create_time >= ?)";
+                Date date = format.parse(createTime);
+                paramList.add(date);
+            }
+            String createEndTime = request.getUploadTimeEnd();
+            if (!Checker.isNull(createEndTime)) {
+                whereSql += " and ( create_time < ? )";
+                Date date = format.parse(createEndTime);
+
+                //把日期往后增加一天.整数往后推,负数往前移动
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(date);
+                calendar.add(Calendar.DATE, 1);
+                //这个时间就是日期往后推一天的结果
+                date = calendar.getTime();
+                paramList.add(date);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return sqlHelper.getList("*", whereSql, "create_time desc", MarketingImage.class, paramList.toArray());
+    }
+
     /**
      * 下载单个文件到服务器
      *
@@ -185,7 +230,7 @@ public class ApplyProjectService {
 
     /**
      * 创建PDF文件：
-     *
+     * <p>
      * 1、先根据从前端选择的条件去数据库查找对应的记录
      * 2、遍历记录去下载对应的文件到服务器；
      * 3、生成pdf