ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:19a7b00cafc1450925769c898c6c8daac1eeb8e4
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标
...
compare: ak:87420cb376525d599bc45b6b2ae14705184c2430
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标

3 Commits
19a7b00caf ... 87420cb376

Author SHA1 Message Date
aikai
87420cb376 feat(bpm): 添加管理成本作为费用大类 
在费用大类中新增了管理成本选项，以满足企业对管理费用的报销需求。这项改动将有助于更全面地覆盖企业的各种费用类型，提高报销系统的适用性和灵活性。
 2025-07-11 16:57:10 +08:00
aikai
dc1f7b19aa refactor(bpm): 移除报销单中设置付款公司名称的代码 
- 删除了 BpmProcessInstanceServiceImpl 中与付款公司名称相关的代码
- 优化了报销单数据的处理逻辑，提高了代码的可读性和维护性
 2025-07-11 16:44:07 +08:00
Echo
3d6737bc57 报销打印 - 对付款公司paymentCompanyName赋值 2025-07-11 16:41:57 +08:00
2 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAExpensesServiceImpl.java
View File

@ -335,6 +335,7 @@ public class BpmOAExpensesServiceImpl extends BpmOABaseService implements BpmOAE
costSectionMap.put(2, "打包"); costSectionMap.put(2, "打包");
costSectionMap.put(3, "搬运"); costSectionMap.put(3, "搬运");
costSectionMap.put(4, "运输"); costSectionMap.put(4, "运输");
costSectionMap.put(5, "管理成本");
List<DictDataRespDTO> bpmOaExpensesType = dictDataApi.getDictDataList("bpm_oa_expenses_type").getCheckedData(); List<DictDataRespDTO> bpmOaExpensesType = dictDataApi.getDictDataList("bpm_oa_expenses_type").getCheckedData();
Map<String, String> typeMap = bpmOaExpensesType.stream().collect(Collectors.toMap(DictDataRespDTO::getValue, DictDataRespDTO::getLabel)); Map<String, String> typeMap = bpmOaExpensesType.stream().collect(Collectors.toMap(DictDataRespDTO::getValue, DictDataRespDTO::getLabel));
List<BpmOAExpensesExportVO> vos = new ArrayList<>(); List<BpmOAExpensesExportVO> vos = new ArrayList<>();

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
View File

@ -29,7 +29,6 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert; import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessCcDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessCcDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.*; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.*;
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;