Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java

@@ -68,7 +68,6 @@ public interface ScmPurchaseChannelFeign {
     @ResponseBody
     public ResultBean choice(@RequestBody List<ScmPurchaseChannelDto> dto);
 
-
     @ApiOperation("销售订单推送待选择采购渠道")
     @PostMapping("/push")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelVo.java

@@ -81,4 +81,8 @@ public class ScmPurchaseChannelVo implements Vo {
     private String operateName;
     @ApiModelProperty("操作日期")
     private String choiceDate;
+    @ApiModelProperty("车型配置关联sid")
+    private String modelConfigSid;
+    @ApiModelProperty("销售指导价")
+    private String guidedPrice;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.xml

@@ -6,10 +6,14 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelVo">
         SELECT  bpc.*,
         bso.procDefId,
-               bso.procInstId
+        bso.procInstId,
+        bvc.sid AS modelConfigSid,
+        bvc.guidedPrice
         FROM scm_purchase_channel bpc
         LEFT JOIN anrui_buscenter.bus_sales_order bso
         ON bpc.`saleOrderSid` = bso.`sid`
+        LEFT JOIN anrui_base.base_vehmodel_config bvc
+        ON bpc.modelSid = bvc.`modelSid` AND bpc.`configSid` = bvc.`configurationItemsSid`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

@@ -119,6 +119,8 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
         if (StringUtils.isNotBlank(query.getConfigName())) {
             qw.like("bpc.configName", query.getConfigName());
         }
+        qw.orderByDesc("bpc.saleOrderApproDate");
+        qw.groupBy("bpc.sid");
         IPage<ScmPurchaseChannel> page = PagerUtil.queryToPage(pq);
         IPage<ScmPurchaseChannelVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmPurchaseChannelVo> p = PagerUtil.pageToVo(pagging, null);