补充客户列表最新跟进记录信息

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferRespVO.java

 package cn.iocoder.yudao.module.sale.vo.offer;
 
+import cn.iocoder.yudao.module.customer.vo.customerFollowup.CustomerFollowupBackVO;
 import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
 import cn.iocoder.yudao.module.sale.vo.offer.prod.OfferProdRespVO;
 import cn.iocoder.yudao.module.sale.vo.offer.transport.OfferTransportCreateReqVO;
 import cn.iocoder.yudao.module.sale.vo.offer.transport.OfferTransportRespVO;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 
@@ -90,4 +92,8 @@ public class OfferRespVO extends OfferBaseVO {
     @ApiModelProperty(value = "业务员名称-客户经理")
     private String businessManagerName;
 
+    @ApiModelProperty("最新跟进记录信息")
+    @TableField(exist = false)
+    private CustomerFollowupBackVO followupBackVO;
+
 }

yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/offer/OfferController.java

@@ -2,8 +2,13 @@ package cn.iocoder.yudao.module.sale.controller.admin.offer;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.customer.convert.customerFollowup.CustomerFollowupConvert;
+import cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO;
+import cn.iocoder.yudao.module.customer.service.customerFollowup.CustomerFollowupService;
+import cn.iocoder.yudao.module.customer.vo.customer.vo.CustomerRespVO;
 import cn.iocoder.yudao.module.sale.dal.dataobject.offer.OfferDO;
 import cn.iocoder.yudao.module.sale.vo.offer.*;
 import cn.iocoder.yudao.module.sale.vo.offerApproval.OfferApprovalBackInfoVO;
@@ -49,7 +54,8 @@ public class OfferController {
     private OfferService offerService;
     @Resource
     private RoleApi roleApi;
-
+    @Resource
+    private CustomerFollowupService customerFollowupService;
 
     @PostMapping("/create")
     @ApiOperation("创建报价单管理")
@@ -179,6 +185,17 @@ public class OfferController {
 //    @PreAuthorize("@ss.hasPermission('ecw:offer:query')")
     public CommonResult<PageResult<OfferRespVO>> getOfferPage(@Valid OfferPageReqVO pageVO) {
         PageResult<OfferRespVO> pageResult = offerService.offerPage(pageVO);
+        if (CollectionUtil.isNotEmpty(pageResult.getList())) {
+            for (OfferRespVO respVO : pageResult.getList()) {
+                CustomerFollowupDO customerFollowupDO = customerFollowupService.getOne(new LambdaQueryWrapperX<CustomerFollowupDO>()
+                        .eq(CustomerFollowupDO::getOfferId, respVO.getOfferId())
+                        .orderByDesc(CustomerFollowupDO::getId)
+                        .last("limit 1"));
+                if (Objects.nonNull(customerFollowupDO)) {
+                    respVO.setFollowupBackVO(CustomerFollowupConvert.INSTANCE.convert(customerFollowupDO));
+                }
+            }
+        }
         return success(pageResult);
     }
 
@@ -200,6 +217,17 @@ public class OfferController {
         }
         addDataScopeQuery(pageVO, loginUser, roleRespDTOS);
         PageResult<OfferRespVO> pageResult = offerService.offerPage(pageVO);
+        if (CollectionUtil.isNotEmpty(pageResult.getList())) {
+            for (OfferRespVO respVO : pageResult.getList()) {
+                CustomerFollowupDO customerFollowupDO = customerFollowupService.getOne(new LambdaQueryWrapperX<CustomerFollowupDO>()
+                        .eq(CustomerFollowupDO::getOfferId, respVO.getOfferId())
+                        .orderByDesc(CustomerFollowupDO::getId)
+                        .last("limit 1"));
+                if (Objects.nonNull(customerFollowupDO)) {
+                    respVO.setFollowupBackVO(CustomerFollowupConvert.INSTANCE.convert(customerFollowupDO));
+                }
+            }
+        }
         return success(pageResult);
     }
 
@@ -210,6 +238,17 @@ public class OfferController {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         pageVO.setDeptId(Objects.isNull(loginUser) || Objects.isNull(loginUser.getDeptId()) ? 0L : loginUser.getDeptId());
         PageResult<OfferRespVO> pageResult = offerService.offerPage(pageVO);
+        if (CollectionUtil.isNotEmpty(pageResult.getList())) {
+            for (OfferRespVO respVO : pageResult.getList()) {
+                CustomerFollowupDO customerFollowupDO = customerFollowupService.getOne(new LambdaQueryWrapperX<CustomerFollowupDO>()
+                        .eq(CustomerFollowupDO::getOfferId, respVO.getOfferId())
+                        .orderByDesc(CustomerFollowupDO::getId)
+                        .last("limit 1"));
+                if (Objects.nonNull(customerFollowupDO)) {
+                    respVO.setFollowupBackVO(CustomerFollowupConvert.INSTANCE.convert(customerFollowupDO));
+                }
+            }
+        }
         return success(pageResult);
     }