报价单详情回显渠道名称

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java

@@ -5,6 +5,7 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto;
 import cn.iocoder.yudao.module.sale.dal.dataobject.offer.OfferDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.sale.vo.offer.*;
@@ -419,4 +420,24 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "</script>"
     })
     List<OfferRespVO> getOrderAssociationOfferList(@Param("queryVO") OrderAssociationOfferQueryVO queryVO, @Param("lang") Integer lang);
+
+    @ResultType(OfferRespVO.class)
+    @Select({
+            "<script>",
+            "SELECT",
+            "o.*,",
+            "d.name as dept_name,",
+            "u.nickname as business_manager_name,",
+            "if(#{lang} = 0, c.name_zh, c.name_en) as channel_name, ",
+            "c.attr_id as channel_attr_id ",
+            "FROM",
+            "ecw_offer o ",
+            "LEFT JOIN ecw_channel c on o.channel_id = c.channel_id",
+            "LEFT JOIN system_dept d on o.dept_id = d.id",
+            "LEFT JOIN system_user u on o.salesman_id = u.id",
+            "WHERE",
+            "o.order_id = #{orderId}",
+            "</script>"
+    })
+    OfferRespVO info(Long offerId);
 }

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java

@@ -647,7 +647,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
             throw exception(OFFER_NOT_EXISTS);
         }
 
-        OfferRespVO respVO = OfferConvert.INSTANCE.convert(offerDO);
+        OfferRespVO respVO = offerMapper.info(offerId);
         EstCostVO estCostVO = JSONObject.parseObject(offerDO.getEstCost(), EstCostVO.class);
         if (Objects.nonNull(estCostVO)) {
             List<FeeDto> feeDtoList = estCostVO.getFeeDtoList();

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

@@ -78,9 +78,15 @@ public class OfferRespVO extends OfferBaseVO {
     @ApiModelProperty(value = "渠道名称")
     private String channelName;
 
+    @ApiModelProperty(value = "渠道特性id")
+    private String channelAttrId;
+
     @ApiModelProperty(value = "客户编号")
     private String customerNumber;
 
+    @ApiModelProperty(value = "客户经理所属部门")
+    private String deptName;
+
     @ApiModelProperty(value = "业务员名称-客户经理")
     private String businessManagerName;