优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@@ -78,6 +78,7 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
      * @return
      */
     IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
+    IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
 
     /**
      * 查询车架号

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -51,10 +51,55 @@
                   , #{name}
                   , '%')
             </if>
-            and (select count (*) from bus_sales_order_vehicle bbv left join bus_sales_order bo on bo.sid = bbv.salesOrderSid where length(bbv.linkSid)
-              >0
-            and bo.contractNo = bd.contractNo)
-              >0
+            AND (
+            SELECT
+            count(*)
+            FROM
+            bus_sales_order_vehicle bbv
+            LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
+            WHERE
+            length( bbv.linkSid )> 0
+            AND bo.contractNo = bd.contractNo
+            )> 0
+        </where>
+        group by bd.contractNo
+    </select>
+
+    <resultMap id="ListMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
+        <result column="sid" jdbcType="VARCHAR" property="sid"/>
+        <result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
+        <result column="paymentMethod" jdbcType="INTEGER" property="paymentMethod"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <collection property="vinList" ofType="com.yxt.anrui.buscenter.api.sysmobilemenu.SysMobileMenuListVo"
+                    select="vinList" column="contractNo">
+        </collection>
+    </resultMap>
+    <select id="getRetrievalNotLists"
+            resultMap="ListMap">
+        SELECT bd.*
+        FROM bus_delivered bd
+        left join bus_sales_order bo on bo.contractNo = bd.contractNo
+        left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(bd.contractNo
+                , '')
+                , ifnull(bd.`name`
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            AND (
+            SELECT
+            count(*)
+            FROM
+            bus_sales_order_vehicle bbv
+            LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
+            WHERE
+            length( bbv.linkSid )> 0
+            AND bo.contractNo = bd.contractNo
+            )> 0
         </where>
         group by bd.contractNo
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -271,6 +271,35 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         return iPage;
     }
 
+    public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
+        QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
+        String name = pq.getParams().getName();
+        IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
+        String orgPath = pq.getParams().getOrgPath();
+        String orgSid = "";
+        if (StringUtils.isNotBlank(orgPath)) {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
+        }
+        qw.eq("bd.useOrgSid", orgSid);
+        qw.eq("bd.state", 1);
+        if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
+            qw.eq("bd.createBySid", pq.getParams().getUserSid());
+        }
+        IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotLists(page, qw, name);
+        for (AppBusDeliveredPageVo record : iPage.getRecords()) {
+            String contractNo = record.getContractNo();
+            QueryWrapper qw2 = new QueryWrapper<>();
+            //待出库：1，出库申请：0
+            qw2.eq("bd.state", 1);
+            qw2.eq("bd.contractNo", contractNo);
+            List<AppVinListVo> vinListVo = baseMapper.selVinListVo(contractNo, qw2);
+            record.setVinList(vinListVo);
+        }
+        return iPage;
+    }
+
     public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
         ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
         AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo();

doc/databases/base_tables.sql

@@ -993,6 +993,8 @@ CREATE TABLE `base_vehicle_state`
     `carryInvoiceState` varchar(64)          DEFAULT NULL COMMENT '欠款开票状态',
     `packageBusiness`   varchar(64)          DEFAULT NULL COMMENT '包牌业务',
     `contractState`     varchar(64)          DEFAULT NULL COMMENT '合同状态',
+    `saleTypeKey`       varchar(64)          DEFAULT NULL COMMENT '销售类型：1全款，2贷款',
+    `finSourceKey`      varchar(64)          DEFAULT NULL COMMENT '款项来源：1自有资金、2三方金融、3担保、4非担保',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB