修改导出

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YcsbController.java

@@ -62,7 +62,7 @@ public class YcsbController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, Ycsb ycsb)
     {
-        List<Ycsb> list = ycsbService.selectYcsbList(ycsb);
+        List<Ycsb> list = ycsbService.selectYcsbListExport(ycsb);
         ExcelUtil<Ycsb> util = new ExcelUtil<Ycsb>(Ycsb.class);
         for (Ycsb ycsbExport : list) {
             if (StringUtils.isNotEmpty(ycsbExport.getCommunity())) {

ruoyi-system/src/main/java/com/ruoyi/system/domain/Fcry.java

@@ -24,7 +24,7 @@ public class Fcry extends BaseEntity
     private Long id;
 
     /** 方舱名称 */
-    @Excel(name = "方舱名称",dictType = "fcPlace")
+    @Excel(name = "方舱名称")
     private String fcPlace;
 
     /** 房间号 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/Ycsb.java

@@ -109,6 +109,14 @@ public class Ycsb extends BaseEntity
     @Transient()
     private List<String> idList;
 
+    public List<String> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<String> idList) {
+        this.idList = idList;
+    }
+
     @Override
     public Date getCreateTime() {
         return createTime;

ruoyi-system/src/main/java/com/ruoyi/system/mapper/YcsbMapper.java

@@ -27,6 +27,13 @@ public interface YcsbMapper
      * @return 抗原异常上报集合
      */
     public List<Ycsb> selectYcsbList(Ycsb ycsb);
+    /**
+     * 查询导出抗原异常上报列表
+     *
+     * @param ycsb 抗原异常上报
+     * @return 抗原异常上报集合
+     */
+    public List<Ycsb> selectYcsbListExport(Ycsb ycsb);
 
     /**
      * 新增抗原异常上报

ruoyi-system/src/main/java/com/ruoyi/system/service/IYcsbService.java

@@ -28,6 +28,13 @@ public interface IYcsbService
      * @return 抗原异常上报集合
      */
     public List<Ycsb> selectYcsbList(Ycsb ycsb);
+    /**
+     * 查询导出抗原异常上报列表
+     *
+     * @param ycsb 抗原异常上报
+     * @return 抗原异常上报集合
+     */
+    public List<Ycsb> selectYcsbListExport(Ycsb ycsb);
 
     /**
      * 新增抗原异常上报

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YcsbServiceImpl.java

@@ -53,6 +53,18 @@ public class YcsbServiceImpl implements IYcsbService
     {
         return ycsbMapper.selectYcsbList(ycsb);
     }
+    /**
+     * 查询导出抗原异常上报列表
+     *
+     * @param ycsb 抗原异常上报
+     * @return 抗原异常上报
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<Ycsb> selectYcsbListExport(Ycsb ycsb)
+    {
+        return ycsbMapper.selectYcsbListExport(ycsb);
+    }
 
     /**
      * 新增抗原异常上报

ruoyi-ui/src/views/system/zlqk/index.vue

@@ -509,7 +509,7 @@ export default {
       }
       this.download('system/zlqk/export', {
         ...this.queryParams
-      }, `zlqk_${new Date().getTime()}.xlsx`)
+      }, `治疗情况数据.xlsx`)
     }
   }
 };