Merge remote-tracking branch 'origin/master'

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/report/ReportLogic.java

@@ -517,6 +517,7 @@ public class ReportLogic {
             row.add(bean.getYearMonth());
             row.add(bean.getWebsitId());
             row.add(bean.getWebsitName());
+            row.add(bean.getWorkerWebsit());
             row.add(bean.getWorkerId());
             row.add(bean.getWorkerName());
             row.add(bean.getTgQty());

mall-server-api/src/main/java/com/gree/mall/manager/logic/quality/QualityFeedbackLogic.java

@@ -289,10 +289,11 @@ public class QualityFeedbackLogic {
                 .list();
         List<Map<String, String>> list = new ArrayList<>();
         for (QualityFeedbackItem data : dataList) {
-            String filePath = data.getUrl();
+            String filePath = data.getUrl().substring(data.getUrl().lastIndexOf("key=") + 4);
+            String suffix = data.getUrl().substring(data.getUrl().lastIndexOf("."));
             Map<String, String> map = new HashMap<>();
             map.put("path", filePath);
-            map.put("fileName", BaseEnum.keyToValueOpt(QualityFeedbackTypeEnum.class, data.getType()).orElse(IdWorker.getIdStr()) + IdWorker.getId());
+            map.put("fileName", BaseEnum.keyToValueOpt(QualityFeedbackTypeEnum.class, data.getType()).orElse(IdWorker.getIdStr()) + suffix);
             list.add(map);
         }
         String downloadName = qualityFeedback.getTitle() + FILE_SUFFIX;

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -1479,14 +1479,14 @@
                 GROUP BY
                     a.worker_id,
                     a.worker_name,
-                    a.worker_websit_id
+                    a.worker_websit_id,
                     a.websit_id,
                     a.websit_name,
                     b.goods_category_id
             ) a
         GROUP BY
             a.worker_id,
-            a.worker_websit_id
+            a.worker_websit_id,
             a.websit_id
     </select>