feat: 申请列表-订单信息展示

谢茂盛
1 parent ed1da727
Showing 2 changed files with 188 additions and 4 deletions
src/main/java/com/order/erp/domain/vo/order/OrderApplyResultVO.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
 package com.order.erp.domain.vo.order;
  
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import org.apache.ibatis.type.LocalDateTimeTypeHandler;
  
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -80,5 +76,30 @@ public class OrderApplyResultVO implements Serializable {
      */
     private String modifyBy;
  
+    /**
+     * 订单基础信息
+     */
+    private OrderBaseInfoVO orderBaseInfo;
+
+    /**
+     * 利润分析信息
+     */
+    private OrderProfitAnalysisVO profitAnalysisInfo;
+
+    /**
+     * 项目完成报告信息
+     */
+    private OrderCompletionReportVO reportInfo;
+
+    /**
+     * 跟单信息
+     */
+    private OrderTrackStageVO trackStageInfo;
+
+    /**
+     * 质检信息
+     */
+    private OrderInspectionStageVO inspectionStageInfo;
+
  
 }
@@ -30,7 +30,10 @@ import org.springframework.transaction.annotation.Transactional;
  
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
  
 /**
@@ -64,6 +67,12 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Resource
     private OrderProfitAnalysisService profitAnalysisService;
  
+    @Resource
+    private OrderTrackStageService trackStageService;
+
+    @Resource
+    private OrderInspectionStageService inspectionStageService;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -114,6 +123,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 return resultVO;
             }).collect(Collectors.toList());
  
+            fillOrderInfo(resultVOList);
             webVOPage.setRecords(resultVOList);
         }
         BeanUtils.copyProperties(page, webVOPage, "records");
@@ -121,6 +131,159 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     }
  
     /**
+     * @param resultVOList
+     */
+    private void fillOrderInfo(List<OrderApplyResultVO> resultVOList) {
+        if (CollectionUtils.isEmpty(resultVOList)) {
+            return;
+        }
+        Set<Long> orderIds = resultVOList.stream().map(OrderApplyResultVO::getOrderId).collect(Collectors.toSet());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+
+        if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
+            fillOrderBaseInfo(resultVOList, orderBaseInfoDOList);
+        }
+
+        List<OrderCompletionReportDO> reportDOList = reportService.list(new LambdaQueryWrapper<OrderCompletionReportDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderCompletionReportDO::getOrderId, orderIds));
+
+        if (CollectionUtils.isNotEmpty(reportDOList)) {
+            fillOrderReportInfo(resultVOList, reportDOList);
+        }
+
+        List<OrderProfitAnalysisDO> profitAnalysisDOList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderProfitAnalysisDO::getOrderId, orderIds));
+
+        if (CollectionUtils.isNotEmpty(profitAnalysisDOList)) {
+            fillOrderProfitInfo(resultVOList, profitAnalysisDOList);
+        }
+
+        List<OrderTrackStageDO> trackStageDOList = trackStageService.list(new LambdaQueryWrapper<OrderTrackStageDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderTrackStageDO::getOrderId, orderIds));
+
+        if (CollectionUtils.isNotEmpty(trackStageDOList)) {
+            fillOrderTrackerInfo(resultVOList, trackStageDOList);
+        }
+
+        List<OrderInspectionStageDO> inspectionStageDOList = inspectionStageService.list(new LambdaQueryWrapper<OrderInspectionStageDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderInspectionStageDO::getOrderId, orderIds));
+
+        if (CollectionUtils.isNotEmpty(inspectionStageDOList)) {
+            fillOrderInspectInfo(resultVOList, inspectionStageDOList);
+        }
+    }
+
+    /**
+     * @param resultVOList
+     * @param orderBaseInfoDOList
+     */
+    private void fillOrderBaseInfo(List<OrderApplyResultVO> resultVOList, List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        if (CollectionUtils.isEmpty(resultVOList)) {
+            return;
+        }
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return;
+        }
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity()));
+        resultVOList.forEach(x -> {
+            if (orderBaseInfoDOMap.containsKey(x.getOrderId())) {
+                OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoDOMap.get(x.getOrderId());
+                OrderBaseInfoVO orderBaseInfo = new OrderBaseInfoVO();
+                BeanUtils.copyProperties(orderBaseInfoDO, orderBaseInfo);
+                x.setOrderBaseInfo(orderBaseInfo);
+            }
+        });
+    }
+
+    /**
+     * @param resultVOList
+     * @param reportDOList
+     */
+    private void fillOrderReportInfo(List<OrderApplyResultVO> resultVOList, List<OrderCompletionReportDO> reportDOList) {
+        if (CollectionUtils.isEmpty(resultVOList)) {
+            return;
+        }
+        if (CollectionUtils.isEmpty(reportDOList)) {
+            return;
+        }
+        Map<Long, OrderCompletionReportDO> reportDOMap = reportDOList.stream().collect(Collectors.toMap(OrderCompletionReportDO::getId, Function.identity()));
+        resultVOList.forEach(x -> {
+            if (reportDOMap.containsKey(x.getOrderId())) {
+                OrderCompletionReportDO reportDO = reportDOMap.get(x.getOrderId());
+                OrderCompletionReportVO reportVO = new OrderCompletionReportVO();
+                BeanUtils.copyProperties(reportDO, reportVO);
+                x.setReportInfo(reportVO);
+            }
+        });
+    }
+
+    /**
+     * @param resultVOList
+     * @param profitAnalysisDOS
+     */
+    private void fillOrderProfitInfo(List<OrderApplyResultVO> resultVOList, List<OrderProfitAnalysisDO> profitAnalysisDOS) {
+        if (CollectionUtils.isEmpty(resultVOList)) {
+            return;
+        }
+        if (CollectionUtils.isEmpty(profitAnalysisDOS)) {
+            return;
+        }
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getId, Function.identity()));
+        resultVOList.forEach(x -> {
+            if (profitAnalysisDOMap.containsKey(x.getOrderId())) {
+                OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(x.getOrderId());
+                OrderProfitAnalysisVO profitAnalysisVO = new OrderProfitAnalysisVO();
+                BeanUtils.copyProperties(profitAnalysisDO, profitAnalysisVO);
+                x.setProfitAnalysisInfo(profitAnalysisVO);
+            }
+        });
+    }
+
+    /**
+     * @param resultVOList
+     * @param trackStageDOS
+     */
+    private void fillOrderTrackerInfo(List<OrderApplyResultVO> resultVOList, List<OrderTrackStageDO> trackStageDOS) {
+        if (CollectionUtils.isEmpty(resultVOList)) {
+            return;
+        }
+        if (CollectionUtils.isEmpty(trackStageDOS)) {
+            return;
+        }
+        Map<Long, OrderTrackStageDO> trackStageDOMap = trackStageDOS.stream().collect(Collectors.toMap(OrderTrackStageDO::getId, Function.identity()));
+        resultVOList.forEach(x -> {
+            if (trackStageDOMap.containsKey(x.getOrderId())) {
+                OrderTrackStageDO trackStageDO = trackStageDOMap.get(x.getOrderId());
+                OrderTrackStageVO trackStageVO = new OrderTrackStageVO();
+                BeanUtils.copyProperties(trackStageDO, trackStageVO);
+                x.setTrackStageInfo(trackStageVO);
+            }
+        });
+    }
+
+    /**
+     * @param resultVOList
+     * @param inspectionStageDOS
+     */
+    private void fillOrderInspectInfo(List<OrderApplyResultVO> resultVOList, List<OrderInspectionStageDO> inspectionStageDOS) {
+        if (CollectionUtils.isEmpty(resultVOList)) {
+            return;
+        }
+        if (CollectionUtils.isEmpty(inspectionStageDOS)) {
+            return;
+        }
+        Map<Long, OrderInspectionStageDO> inspectionStageDOMap = inspectionStageDOS.stream().collect(Collectors.toMap(OrderInspectionStageDO::getId, Function.identity()));
+        resultVOList.forEach(x -> {
+            if (inspectionStageDOMap.containsKey(x.getOrderId())) {
+                OrderInspectionStageDO inspectionStageDO = inspectionStageDOMap.get(x.getOrderId());
+                OrderInspectionStageVO inspectionStageVO = new OrderInspectionStageVO();
+                BeanUtils.copyProperties(inspectionStageDO, inspectionStageVO);
+                x.setInspectionStageInfo(inspectionStageVO);
+            }
+        });
+    }
+
+    /**
      * @param queryVO
      * @return
      */