Commit 2f467ab3 authored by zhengyi's avatar zhengyi

批量费用申请审批详情展示内容做筛选,只返回新增审批和修改审批内容,其他未做改变的内容不展示

parent 00452373
...@@ -55,6 +55,7 @@ import java.util.ArrayList; ...@@ -55,6 +55,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.*;
...@@ -661,7 +662,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl ...@@ -661,7 +662,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
OrderApprovalDO orderApprovalDO = orderApprovalService.getApproval(Long.valueOf(processId)); OrderApprovalDO orderApprovalDO = orderApprovalService.getApproval(Long.valueOf(processId));
if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getType() == 41 && StringUtils.isNotBlank(orderApprovalDO.getDetails())) { if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getType() == 41 && StringUtils.isNotBlank(orderApprovalDO.getDetails())) {
List<OrderFeeApplicationDO> orderFeeApplicationDOList = JSONObject.parseArray(orderApprovalDO.getDetails(), OrderFeeApplicationDO.class); List<OrderFeeApplicationDO> orderFeeApplicationDOList = JSONObject.parseArray(orderApprovalDO.getDetails(), OrderFeeApplicationDO.class);
return OrderFeeApplicationConvert.INSTANCE.convertList(orderFeeApplicationDOList); return OrderFeeApplicationConvert.INSTANCE.convertList(orderFeeApplicationDOList.stream().filter(fee -> Objects.isNull(fee.getId()) || fee.isEditMode()).collect(Collectors.toList()));
}else { }else {
List<OrderFeeApplicationDO> orderFeeApplicationDOList = feeApplicationMapper.selectList(OrderFeeApplicationDO::getBatchBpmBusinessId, processId); List<OrderFeeApplicationDO> orderFeeApplicationDOList = feeApplicationMapper.selectList(OrderFeeApplicationDO::getBatchBpmBusinessId, processId);
return OrderFeeApplicationConvert.INSTANCE.convertList(orderFeeApplicationDOList); return OrderFeeApplicationConvert.INSTANCE.convertList(orderFeeApplicationDOList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment