备品备件问题需求开发 - 导出API、列表查询API添加筛选条件

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/WlSpareEquipmentExportVo.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -51,13 +52,11 @@ public class WlSpareEquipmentExportVo {
 
     @Excel(name = "生产日期")
     @ExcelProperty(value = "生产日期", index = 10)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date productionDate; // 生产日期
+    private String productionDate; // 生产日期
 
     @Excel(name = "采购日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "采购日期", index = 11)
-    private Date purchaseDate; // 采购日期
+    private String purchaseDate; // 采购日期
 
     @Excel(name = "备注")
     @ExcelProperty(value = "备注", index = 12)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WlSpareEquipmentController.java

@@ -2,6 +2,8 @@ package com.yeejoin.equipmanage.controller;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -213,13 +215,16 @@ public class WlSpareEquipmentController extends BaseController {
             exportList = wlSpareEquipmentService.exportList(dto, 0, null);
         }
         List<WlSpareEquipmentExportVo> exportVoList = new ArrayList<>();
-        exportVoList.forEach(item -> {
+        exportList.forEach(item -> {
             WlSpareEquipmentExportVo exportVo = new WlSpareEquipmentExportVo();
             BeanUtils.copyProperties(item, exportVo, "single");
             exportVo.setSingle(SingleEnum.DXGL.getKey().equals(item.getSingle()) ? "单项管理" : "批量管理");
+            exportVo.setWarehouseStructure(item.getWarehouseStructureCode());
+            exportVo.setProductionDate(DateUtil.format(item.getProductionDate(), DatePattern.NORM_DATE_PATTERN));
+            exportVo.setPurchaseDate(DateUtil.format(item.getPurchaseDate(), DatePattern.NORM_DATE_PATTERN));
             exportVoList.add(exportVo);
         });
-        ExcelUtil.createTemplate(response, "消防装备备品备件", "备品备件信息", exportList, WlSpareEquipmentExportVo.class, null, false);
+        ExcelUtil.createTemplate(response, "消防装备备品备件", "备品备件信息", exportVoList, WlSpareEquipmentExportVo.class, null, false);
     }
 
     /**

amos-boot-system-equip/src/main/resources/mapper/WlSpareEquipmentMapper.xml

@@ -27,6 +27,9 @@
         <if test="dto.warehouseStructureId != null">
             AND warehouse_structure_id = #{dto.warehouseStructureId}
         </if>
+        <if test="dto.equipModelId != null">
+            AND `equip_model_id` = #{dto.equipModelId}
+        </if>
     </where>
     ORDER BY create_date DESC
     </select>
@@ -77,6 +80,9 @@
         <if test="dto.warehouseStructureId != null">
             AND warehouse_structure_id = #{dto.warehouseStructureId}
         </if>
+        <if test="dto.equipModelId != null">
+            AND `equip_model_id` = #{dto.equipModelId}
+        </if>
     </where>
     ORDER BY create_date DESC
     </select>