diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltMonthInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltMonthInfoController.java index a4caade..8b656a0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltMonthInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltMonthInfoController.java @@ -66,4 +66,17 @@ public class SltMonthInfoController extends BaseController { return AjaxResult.success("审核成功"); } + + /** + * 导出 + */ + @ApiOperation("费用导出") + @Log(title = "费用导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SltMonthInfo bean) { + List list = sltMonthInfoService.getSltMonthInfo(bean); + ExcelUtil util = new ExcelUtil<>(SltMonthInfo.class); + util.exportExcel(response, list, "月度租赁费用"); + } + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SltMonthInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SltMonthInfo.java index c1c9400..6873a91 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SltMonthInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SltMonthInfo.java @@ -37,7 +37,6 @@ public class SltMonthInfo extends BaseEntity { /** * 合同 */ - @Excel(name = "合同编号") @ApiModelProperty(value = "合同") private String contractCode; @@ -85,7 +84,7 @@ public class SltMonthInfo extends BaseEntity { /** * 租赁费用月份 */ - @Excel(name = "状态") + @Excel(name = "状态", readConverterExp = "0=未审核,1=已审核") @ApiModelProperty(value = "状态") private String status; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltMonthInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltMonthInfoMapper.xml index c4eb142..2d60b3b 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltMonthInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltMonthInfoMapper.xml @@ -38,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id WHERE pmc.`month` =#{month} + + and pmc.status = #{status} + and bai.unit_id = #{unitId}