Просмотр исходного кода

修改bug:
报价,从订单管理点击编辑,进入报价页面,业务员应该携带上

jiakai 4 месяцев назад
Родитель
Сommit
3ceace3fac

+ 1 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -477,7 +477,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
 
         // 业务员信息
-        SalesmanVo salesmanInfo = orgClient.getUserByMobile(insOrdersVo.getCreateBy());
+        SalesmanVo salesmanInfo = orgClient.getUserByMobile(insOrdersVo.getInsOrders().getRealQuoteUserId());
         if (Objects.nonNull(salesmanInfo)) {
             InsOrdersVo.Salesman salesman = new InsOrdersVo.Salesman();
             salesman.setName(salesmanInfo.getName());

+ 6 - 0
tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -24,6 +24,7 @@
         <result property="insOrderNo" column="ins_order_no" jdbcType="VARCHAR"/>
         <result property="signingTime" column="signing_time" jdbcType="VARCHAR"/>
         <result property="isTemporarily" column="is_temporarily" jdbcType="VARCHAR"/>
+        <result property="realQuoteUserId" column="real_quote_user_id" jdbcType="VARCHAR"/>
     </resultMap>
     <!--    订单 车辆信息-->
     <resultMap id="carInfoMap" type="com.jzg.commons.entity.quote.vo.CarInfoVo">
@@ -553,6 +554,9 @@
             <if test="insOrdersParam.companyName != null and insOrdersParam.companyName != ''">
                 AND o.company_name = #{insOrdersParam.companyName}
             </if>
+            <if test="insOrdersParam.companyId != null and insOrdersParam.companyId != ''">
+                AND o.company_id = #{insOrdersParam.companyId}
+            </if>
             <if test="insOrdersParam.salesman != null and insOrdersParam.salesman != ''">
                 AND suji.name = #{insOrdersParam.salesman}
             </if>
@@ -587,6 +591,7 @@
                order_status,
                company_id,
                company_name,
+               real_quote_user_id,
                product_id,
                product_name,
                entry_status,
@@ -704,6 +709,7 @@
                company_name,
                product_id,
                product_name,
+               real_quote_user_id,
                audit_status,
                audit_comments,
                create_by,