批量费用申请审批详情内容未展示的bug修复

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java

@@ -630,22 +630,42 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
 
     @Override
     public OrderFeeApplicationBackVO getOrderByProcessId(String processId) {
-        OrderFeeApplicationDO orderFeeApplicationDO = feeApplicationMapper.selectOne(OrderFeeApplicationDO::getBpmProcessId, processId);
-        OrderFeeApplicationBackVO convert = OrderFeeApplicationConvert.INSTANCE.convert(orderFeeApplicationDO);
-        if (orderFeeApplicationDO != null) {
-            OrderBackVO order = orderQueryService.getOrder(orderFeeApplicationDO.getOrderId());
-            LogisticsInfoDto startInfoAndDestInfoByLineId = warehouseLineMapper.getStartInfoAndDestInfoByLineId(order.getLineId());
-            convert.setStartWarehouse(startInfoAndDestInfoByLineId.getStartTitleZh());
-            convert.setDestWarehouse(startInfoAndDestInfoByLineId.getDestTitleZh());
-            convert.setOrderBackVO(order);
+        OrderApprovalDO orderApprovalDO = orderApprovalService.getOne(new LambdaQueryWrapper<OrderApprovalDO>().eq(OrderApprovalDO::getFormId, processId).orderByDesc(OrderApprovalDO::getOrderApprovalId).last("limit 1"));
+        if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getType() == 12 && StringUtils.isNotBlank(orderApprovalDO.getDetails())) {
+            OrderFeeApplicationDO orderFeeApplicationDO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderFeeApplicationDO.class);
+            OrderFeeApplicationBackVO convert = OrderFeeApplicationConvert.INSTANCE.convert(orderFeeApplicationDO);
+            if (orderFeeApplicationDO != null) {
+                OrderBackVO order = orderQueryService.getOrder(orderFeeApplicationDO.getOrderId());
+                LogisticsInfoDto startInfoAndDestInfoByLineId = warehouseLineMapper.getStartInfoAndDestInfoByLineId(order.getLineId());
+                convert.setStartWarehouse(startInfoAndDestInfoByLineId.getStartTitleZh());
+                convert.setDestWarehouse(startInfoAndDestInfoByLineId.getDestTitleZh());
+                convert.setOrderBackVO(order);
+            }
+            return convert;
+        }else {
+            OrderFeeApplicationDO orderFeeApplicationDO = feeApplicationMapper.selectOne(OrderFeeApplicationDO::getBpmProcessId, processId);
+            OrderFeeApplicationBackVO convert = OrderFeeApplicationConvert.INSTANCE.convert(orderFeeApplicationDO);
+            if (orderFeeApplicationDO != null) {
+                OrderBackVO order = orderQueryService.getOrder(orderFeeApplicationDO.getOrderId());
+                LogisticsInfoDto startInfoAndDestInfoByLineId = warehouseLineMapper.getStartInfoAndDestInfoByLineId(order.getLineId());
+                convert.setStartWarehouse(startInfoAndDestInfoByLineId.getStartTitleZh());
+                convert.setDestWarehouse(startInfoAndDestInfoByLineId.getDestTitleZh());
+                convert.setOrderBackVO(order);
+            }
+            return convert;
         }
-        return convert;
     }
 
     @Override
     public List<OrderFeeApplicationBackVO> getBatchFeeByProcessId(String processId) {
-        List<OrderFeeApplicationDO> orderFeeApplicationDOList = feeApplicationMapper.selectList(OrderFeeApplicationDO::getBatchBpmBusinessId, processId);
-        return OrderFeeApplicationConvert.INSTANCE.convertList(orderFeeApplicationDOList);
+        OrderApprovalDO orderApprovalDO = orderApprovalService.getApproval(Long.valueOf(processId));
+        if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getType() == 41 && StringUtils.isNotBlank(orderApprovalDO.getDetails())) {
+            List<OrderFeeApplicationDO> orderFeeApplicationDOList = JSONObject.parseArray(orderApprovalDO.getDetails(), OrderFeeApplicationDO.class);
+            return OrderFeeApplicationConvert.INSTANCE.convertList(orderFeeApplicationDOList);
+        }else {
+            List<OrderFeeApplicationDO> orderFeeApplicationDOList = feeApplicationMapper.selectList(OrderFeeApplicationDO::getBatchBpmBusinessId, processId);
+            return OrderFeeApplicationConvert.INSTANCE.convertList(orderFeeApplicationDOList);
+        }
     }
 
     @Override