Compare commits

...

2 Commits

Author SHA1 Message Date
aikai
1ebd9cea07 refactor(bpm): 优化开支日报申请导出功能
- 修改导出文件名称为"开支日报申请.xls"
- 优化 BpmOAExpensesExportVO 结构,移除未使用的字段
-重构 BpmOAExpensesServiceImpl 中的导出逻辑,提高代码可读性和性能
2025-07-11 15:45:59 +08:00
aikai
f9efa7aea0 feat(bpm): 添加生产开支申请 Excel 导出功能
- 新增 BpmOAExpensesExportVO 类用于 Excel 导出
- 在 BpmOAExpensesController 中添加 exportExpensesExcel 方法处理导出逻辑
- 在 BpmOAExpensesService 接口中定义 convertExpensesList 方法用于数据转换- 在 BpmOAExpensesServiceImpl 中实现 convertExpensesList 方法,将费用列表转换为导出 VO 列表
2025-07-11 15:28:43 +08:00
4 changed files with 121 additions and 6 deletions

View File

@ -1,8 +1,11 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.expenses.*;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAExpensesDO;
import cn.iocoder.yudao.module.bpm.service.oa.BpmOAExpensesService;
@ -13,9 +16,13 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
/**
@ -106,4 +113,19 @@ public class BpmOAExpensesController {
expensesService.oneClickPayment(month);
return success(true);
}
@GetMapping("/export-excel")
@Operation(summary = "导出开支日报申请 Excel")
@DataPermission(enable = false)
@OperateLog(type = EXPORT)
public void exportExpensesExcel(@Valid BpmOAExpensesPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
PageResult<BpmOAExpensesPageRespVO> pageResult = expensesService.getExpensesPage(pageReqVO);
//转换
List<BpmOAExpensesExportVO> list = expensesService.convertExpensesList(pageResult.getList());
// 导出 Excel
ExcelUtils.write(response, "开支日报申请.xls", "数据", BpmOAExpensesExportVO.class, list);
}
}

View File

@ -0,0 +1,58 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.expenses;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* 生产开支 Excel 导出 VO
*
* @author 符溶馨
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = false)
public class BpmOAExpensesExportVO {
@ExcelProperty("申请用户")
private String userName;
@ExcelProperty("费用类型")
private String typeName;
@ExcelProperty("费用板块")
private String costSectionName;
@ExcelProperty("费用产生部门")
private String deptName;
@ExcelProperty("支出金额(元)")
private BigDecimal amount;
@ExcelProperty("费用明细")
private String detail;
@ExcelProperty("报销总金额(元)")
private BigDecimal totalMoney;
@ExcelProperty("收款人")
private String payeeName;
@ExcelProperty("开户行")
private String bankName;
@ExcelProperty("银行卡号")
private String bankNo;
@ExcelProperty("支付状态")
private String statusName;
}

View File

@ -97,4 +97,11 @@ public interface BpmOAExpensesService {
* @param month 月份
*/
void oneClickPayment(String month);
/**
* 转换
* @param list
* @return
*/
List<BpmOAExpensesExportVO> convertExpensesList(List<BpmOAExpensesPageRespVO> list);
}

View File

@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.bpm.service.oa;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@ -25,6 +27,8 @@ import cn.iocoder.yudao.module.smartfactory.api.staff.StaffApi;
import cn.iocoder.yudao.module.smartfactory.api.staff.dto.StaffDTO;
import cn.iocoder.yudao.module.system.api.bank.BankApi;
import cn.iocoder.yudao.module.system.api.bank.dto.BankRespDTO;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.system.api.loan.LoanApi;
import cn.iocoder.yudao.module.system.api.loan.dto.LoanDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@ -39,9 +43,7 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@ -92,6 +94,8 @@ public class BpmOAExpensesServiceImpl extends BpmOABaseService implements BpmOAE
@Resource
private StaffApi staffApi;
@Resource
private DictDataApi dictDataApi;
@Override
public Long createExpenses(Long userId, BpmOAExpensesCreateReqVO createReqVO) {
@ -320,4 +324,28 @@ public class BpmOAExpensesServiceImpl extends BpmOABaseService implements BpmOAE
expensesMapper.oneClickPayment(month);
}
@Override
public List<BpmOAExpensesExportVO> convertExpensesList(List<BpmOAExpensesPageRespVO> list) {
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
Map<Integer, String> costSectionMap = new HashMap<>();
costSectionMap.put(1, "叉车");
costSectionMap.put(2, "打包");
costSectionMap.put(3, "搬运");
costSectionMap.put(4, "运输");
List<DictDataRespDTO> bpmOaExpensesType = dictDataApi.getDictDataList("bpm_oa_expenses_type").getCheckedData();
Map<String, String> typeMap = bpmOaExpensesType.stream().collect(Collectors.toMap(DictDataRespDTO::getValue, DictDataRespDTO::getLabel));
List<BpmOAExpensesExportVO> vos = new ArrayList<>();
for (BpmOAExpensesPageRespVO bpmOAExpensesPageRespVO : list) {
BpmOAExpensesExportVO vo = BeanUtil.copyProperties(bpmOAExpensesPageRespVO, BpmOAExpensesExportVO.class);
vo.setTypeName(typeMap.get(String.valueOf(bpmOAExpensesPageRespVO.getType())));
vo.setStatusName(bpmOAExpensesPageRespVO.getStatus() == 0 ? "未支付" : "已支付");
// 费用板块 费用板块 | 1叉车 2打包 3搬运 4运输
vo.setCostSectionName(costSectionMap.get(bpmOAExpensesPageRespVO.getCostSection()));
vos.add(vo);
}
return vos;
}
}