销售订单-选择现车分页列表

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -204,9 +203,9 @@ public interface BaseVehicleFeign {
     @PostMapping("/vehicleActualList")
     ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(@RequestBody PagerQuery<BaseVehicleReturnQuery> pagerQuery);
 
-    @ApiOperation("销售订单选择现车数量及列表")
+    @ApiOperation("销售订单选择现车分页列表")
-    @GetMapping("/selectVo")
+    @PostMapping("/selectVo")
-    ResultBean<PcBaseVehicleOrderVo> selectVo(@SpringQueryMap PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery);
+    ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(@RequestBody PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery);
 
     /***************************************************** App接口 **********************************************************/
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -125,7 +125,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
+    public ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderListVo.java

@@ -1,25 +0,0 @@
-package com.yxt.anrui.base.api.basevehicle;
-
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @Author dimengzhe
- * @Date 2022/4/28 16:58
- * @Description
- */
-@Data
-public class PcBaseVehicleOrderListVo implements Vo {
-    private static final long serialVersionUID = 3105577353109956233L;
-
-    @ApiModelProperty("车架号")
-    private String linkNo;
-    @ApiModelProperty("车辆存放地点")
-    private String linkText;
-    @ApiModelProperty("车辆sid")
-    private String linkSid;
-    @ApiModelProperty(value = "是否是虚拟订单:1是，0不是")
-    private int isFictitious;
-
-}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderVo.java

@@ -4,8 +4,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Author dimengzhe
  * @Date 2022/4/28 16:57
@@ -15,8 +13,12 @@ import java.util.List;
 public class PcBaseVehicleOrderVo implements Vo {
     private static final long serialVersionUID = 3137353876161746499L;
 
-    @ApiModelProperty(value = "现车的数量")
+    @ApiModelProperty("车架号")
-    private int num;
+    private String linkNo;
-    @ApiModelProperty(value = "点击选择出现的现车列表")
+    @ApiModelProperty("车辆存放地点")
-    private List<PcBaseVehicleOrderListVo> pcBaseVehicleOrderList;
+    private String linkText;
+    @ApiModelProperty("车辆sid")
+    private String linkSid;
+    @ApiModelProperty(value = "是否是虚拟订单:1是，0不是")
+    private int isFictitious;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -312,4 +312,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @return
      */
     IPage<BaseVehicleActualVo> vehicleActualPageList(IPage<BaseVehicleActualVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    IPage<PcBaseVehicleOrderVo> selectVo(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -12,12 +12,12 @@
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT bv.sid,
-        bv.modelName,
+               bv.modelName,
-        bv.vinNo,
+               bv.vinNo,
-        bv.engineNo,
+               bv.engineNo,
-        bv.vehicleStateValue,
+               bv.vehicleStateValue,
-        bv.location,
+               bv.location,
-        bv.libraryAge
+               bv.libraryAge
         FROM base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -69,10 +69,10 @@
         <!--库龄（根据首次发车日期计算）-->
         bv.libraryAge
         FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-        LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-        LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
+                 LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
     <!--删除或批量删除车辆信息-->
     <delete id="deleteBySids" parameterType="java.util.List">
@@ -158,16 +158,16 @@
         bvm.isValidity,
         bvm.isValidityValue
         FROM base_vehicle_model bvm
-        LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
-        LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+                 LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
-        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
         WHERE bvm.sid = #{modelSid}
-        AND bmc.sid = #{modelConfigSid}
+          AND bmc.sid = #{modelConfigSid}
     </select>
     <!--导入车辆信息-->
     <insert id="saveList">
         INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
-        vehicleState, firstStartDate, libraryAge)
+                                 vehicleState, firstStartDate, libraryAge)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -196,8 +196,8 @@
     </select>
     <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         select bv.sid,
-        bv.modelSid,
+               bv.modelSid,
-        bv.modelConfigSid,
+               bv.modelConfigSid,
         <!--车架号(VIN)-->
         bv.vinNo,
         <!--发动机号/许可证号-->
@@ -256,13 +256,13 @@
     <select id="getAppCurrentCarByPageList"
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
         SELECT bvm.sid AS modelSid,
-        bvm.vehicleAlias,
+               bvm.vehicleAlias,
-        bvm.brandName,
+               bvm.brandName,
-        bvm.vehicleVersionValue,
+               bvm.vehicleVersionValue,
-        bvm.fuelTypeValue,
+               bvm.fuelTypeValue,
-        bvm.gearboxTypeValue
+               bvm.gearboxTypeValue
         FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -373,9 +373,9 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
@@ -438,8 +438,8 @@
         <!--销售指导价-->
         bv.guidedPrice
         FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         WHERE bv.sid = #{sid}
     </select>
 
@@ -476,29 +476,29 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
         ORDER BY
-        bv.priceDate desc
+            bv.priceDate desc
     </select>
 
     <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
-        SELECT bvm.sid AS modelSid,
+        SELECT bvm.sid                                                                                     AS modelSid,
-        bvm.vehicleAlias AS modelName,
+               bvm.vehicleAlias                                                                            AS modelName,
-        bvm.carBrand AS brandSid,
+               bvm.carBrand                                                                                AS brandSid,
-        bvm.brandName,
+               bvm.brandName,
-        bvm.vehicleVersionValue AS versionValue,
+               bvm.vehicleVersionValue                                                                     AS versionValue,
-        bvm.fuelTypeValue,
+               bvm.fuelTypeValue,
-        bvm.gearboxTypeValue,
+               bvm.gearboxTypeValue,
-        bvc.priceValidity,
+               bvc.priceValidity,
-        (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid) AS configNum,
+               (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid)                    AS configNum,
-        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
+               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
-        (SELECT count(*)
+               (SELECT count(*)
-        FROM bus_vehicle_apply_detail bvad
+                FROM bus_vehicle_apply_detail bvad
-        WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
+                WHERE bvad.vehicleSid = bvm.sid)                                                           AS produceCarNum
         FROM base_vehicle_model bvm
-        LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+                 LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -575,9 +575,9 @@
         bmc.configName,
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
         FROM base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <update id="updateByVinNo">
@@ -647,4 +647,17 @@
         from base_vehicle bv
         where bv.vinNo = #{vinNo}
     </select>
+
+    <select id="selectVo" resultType="com.yxt.anrui.base.api.basevehicle.PcBaseVehicleOrderVo">
+        select bv.vinNo    linkNo,
+               bv.location linkText,
+               bv.sid      linkSid,
+               if(bv.lockedState = 1, 1, 0)
+                   as      isFictitious
+        from base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+            order by isFictitious desc
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -6,7 +6,6 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
-import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
@@ -334,8 +333,10 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
+    public ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery) {
-        return baseVehicleService.selectVo(pcBaseVehicleOrderQuery);
+        ResultBean<PagerVo<PcBaseVehicleOrderVo>> rb = ResultBean.fireFail();
+        PagerVo<PcBaseVehicleOrderVo> pv = baseVehicleService.selectVo(pcBaseVehicleOrderQuery);
+        return rb.success().setData(pv);
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -6,13 +6,14 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -76,6 +77,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     @Autowired
     private ScmVehicleReturnDetailsFeign scmVehicleReturnDetailsFeign;
 
+    @Autowired
+    private PcBusMainDepositFeign pcBusMainDepositFeign;
+
     /**
      * 车辆信息分页列表
      *
@@ -1150,18 +1154,34 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return qw;
     }
 
-    public ResultBean<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
+    public PagerVo<PcBaseVehicleOrderVo> selectVo(PagerQuery<PcBaseVehicleOrderQuery> pagerQuery) {
-        ResultBean<PcBaseVehicleOrderVo> rb = ResultBean.fireFail();
+        PcBaseVehicleOrderQuery query = pagerQuery.getParams();
-        //判断选择的是意向车型还是虚拟订单还是车型配置
+        QueryWrapper<BaseVehicle> qw = createSelectPageWrapper(query);
-        int type = pcBaseVehicleOrderQuery.getType();
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(pagerQuery);
-        if (type == 1 || type == 3) {
+        IPage<PcBaseVehicleOrderVo> pagging = baseMapper.selectVo(page, qw);
-            //查询该车型该配置下的所有现车的数量
+        PagerVo<PcBaseVehicleOrderVo> p = PagerUtil.pageToVo(pagging, null);
-
+        return p;
-
+    }
-        } else {
 
+    private QueryWrapper<BaseVehicle> createSelectPageWrapper(PcBaseVehicleOrderQuery query) {
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        if (query != null) {
+            qw.eq("bv.modelSid", query.getModelSid());//车型sid
+            qw.eq("bv.modelConfigSid", query.getModelConfigSid());//配置sid
+            if (query.getType() == 2) {
+                //根据业务员sid和客户sid查询所有的虚拟虚拟订单的车辆
+                PcBusMainDepositVehicleQuery vehicleQuery = new PcBusMainDepositVehicleQuery();
+                vehicleQuery.setCustomerSid(query.getCustomerSid());
+                vehicleQuery.setModelConfigSid(query.getModelConfigSid());
+                vehicleQuery.setStaffSid(query.getStaffSid());
+                vehicleQuery.setModelSid(query.getModelSid());
+                ResultBean<List<String>> stringList = pcBusMainDepositFeign.selectVehicleList(vehicleQuery);
+                if (stringList.getSuccess()) {
+                   qw.in("bv.sid",stringList.getData());
+                }
+//                qw.eq("bv.lockedState", 1);//车辆的锁定状态为1
+            }
         }
-        return rb.success();
+        return qw;
-
     }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java

@@ -5,10 +5,14 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/28 14:07
@@ -25,4 +29,10 @@ public interface PcBusMainDepositFeign {
     @PostMapping(value = "/pageList")
     @ApiOperation(value = "销售订单-虚拟订单分页列表")
     ResultBean<PagerVo<PcBusMainDepositVo>> pageList(@RequestBody PagerQuery<PcBusMainDepositQuery> pagerQuery);
+
+    @ResponseBody
+    @GetMapping(value = "/selectVehicleList")
+    @ApiOperation(value = "销售订单-查询配置该业务员该客户选择的该车型及配置下的所有车辆的集合")
+    ResultBean<List<String>> selectVehicleList(@SpringQueryMap PcBusMainDepositVehicleQuery query);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVehicleQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.buscenter.api.busmaindeposit.pc;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/29 8:52
+ * @Description
+ */
+@Data
+public class PcBusMainDepositVehicleQuery implements Query {
+    private static final long serialVersionUID = 8461654016604027355L;
+
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String modelConfigSid;
+    @ApiModelProperty(value = "业务员sid")
+    private String staffSid;
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -67,9 +67,4 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/fetchDetailsBySid无法访问");
     }
-
-    @Override
-    public ResultBean<BusSalesOrderVehicleVo> selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) {
-        return null;
-    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -104,4 +104,15 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
      * @return
      */
     IPage<PcBusMainDepositVo> orderPageList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw);
+
+    /**
+     * 根据车型sid、车型配置sid、业务员sid、客户sid查询车辆sid
+     *
+     * @param modelSid       车型sid
+     * @param modelConfigSid 配置sid
+     * @param staffSid       业务员sid
+     * @param customerSid    客户sid
+     * @return
+     */
+    List<String> selectVehicleList(@Param("modelSid") String modelSid, @Param("modelConfigSid") String modelConfigSid, @Param("staffSid") String staffSid, @Param("customerSid") String customerSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -1,43 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositMapper">
-
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositListVo">
-        SELECT
+        SELECT bmd.id,
-        bmd.id,bmd.sid,bmd.billNo,bmd.depositBillTypeKey,bmd.depositBillType,bmd.createDate,bmd.staffName,bd.deposit,
+               bmd.sid,
-        IF(bd.id IS NOT NULL,bd.draweeName,bdvc.customerName) name,
+               bmd.billNo,
-        IF(bd.id IS NOT NULL,bd.draweeMobile,bdvc.customerMobile) mobile,
+               bmd.depositBillTypeKey,
-        IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle
+               bmd.depositBillType,
+               bmd.createDate,
+               bmd.staffName,
+               bd.deposit,
+               IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName)     name,
+               IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile,
+               IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id))                    depositVehicle
         FROM bus_main_deposit bmd
-        LEFT JOIN bus_deposit bd on bmd.sid=bd.billSid
+                 LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid
-        LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid=bdvc.billSid
+                 LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid
-        LEFT JOIN bus_deposit_vehicle bdv on bmd.sid=bdv.billSid
+                 LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid
-        <where>${ew.sqlSegment}</where>
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositVo">
-        SELECT * FROM bus_main_deposit
+        SELECT *
-        <where>${ew.sqlSegment}</where>
+        FROM bus_main_deposit
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <!--虚拟订单列表-->
     <select id="getVirtualOrders" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo">
-        SELECT bmd.sid AS virtualOrderSid,
+        SELECT bmd.sid                AS virtualOrderSid,
-        bmd.billNo AS virtualOrderId,
+               bmd.billNo             AS virtualOrderId,
-        bmd.createDate AS virtualOrderDate,
+               bmd.createDate         AS virtualOrderDate,
-        bmd.depositBillTypeKey AS virtualOrderType,
+               bmd.depositBillTypeKey AS virtualOrderType,
-        bmd.staffName AS sellerName,
+               bmd.staffName          AS sellerName,
-        bmd.remarks,
+               bmd.remarks,
-        bd.vehicleNum AS carNumber,
+               bd.vehicleNum          AS carNumber,
-        bdvc.customerName,
+               bdvc.customerName,
-        bd.draweeName AS payName,
+               bd.draweeName          AS payName,
-        bd.draweeMobile AS mobile
+               bd.draweeMobile        AS mobile
         FROM bus_main_deposit bmd
-        LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+                 LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
-        LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+                 LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
-        <where>${ew.sqlSegment}</where>
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <delete id="deleteVirtualOrder">
@@ -123,26 +135,40 @@
 
     <update id="updateFlowFiled" parameterType="java.util.Map">
         UPDATE bus_main_deposit
-        SET nodeState=#{nodeState}, taskDefKey=#{taskDefKey}
+        SET nodeState=#{nodeState}
+          , taskDefKey=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
         <if test="procInsId != null and procInsId != ''">
             , procInsId=#{procInsId}
         </if>
-        WHERE sid=#{sid}
+        WHERE sid = #{sid}
     </update>
 
     <select id="orderPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo">
         select bv.brandName,
-        bv.modelName,
+               bv.modelName,
-        bv.modelotherConfig,
+               bv.modelotherConfig,
-        bv.modelSid,
+               bv.modelSid,
-        bv.modelConfigSid
+               bv.modelConfigSid
+        from bus_main_deposit bd
+                 left join bus_deposit_vehicle_customer bc
+                           on bc.billSid = bd.sid
+                 left join bus_deposit_vehicle bv on bv.billSid = bc.sid
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectVehicleList" resultType="java.lang.String">
+        select bv.vehicleSid
         from bus_main_deposit bd
-        left join bus_deposit_vehicle_customer bc
+                 left join bus_deposit_vehicle_customer bc
-        on bc.billSid = bd.sid
+                           on bc.billSid = bd.sid
-        left join bus_deposit_vehicle bv on bv.billSid = bc.sid
+                 left join bus_deposit_vehicle bv on bv.billSid = bd.sid
-        ${ew.customSqlSegment}
+        where bv.modelSid = #{modelSid}
+          and bv.modelConfigSid = #{modelConfigSid}
+          AND bc.customerSid = #{customerSid}
+          and bd.staffSid = #{staffSid}
+          and bd.depositBillTypeKey = '02'
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -41,6 +41,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCu
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
@@ -1465,7 +1466,20 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         qw.eq("bd.staffSid", query.getStaffSid());
         qw.eq("bc.customerSid", query.getCustomerSid());
-        qw.groupBy("bv.modelSid","bv.modelConfigSid");
+        qw.groupBy("bv.modelSid", "bv.modelConfigSid");
         return qw;
     }
+
+    public ResultBean<List<String>> selectVehicleList(PcBusMainDepositVehicleQuery query) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        String modelSid = query.getModelSid();
+        String modelConfigSid = query.getModelConfigSid();
+        String staffSid = query.getStaffSid();
+        String customerSid = query.getCustomerSid();
+        List<String> stringList = baseMapper.selectVehicleList(modelSid, modelConfigSid, staffSid, customerSid);
+        if(stringList.size() == 0){
+            return rb;
+        }
+        return rb.success().setData(stringList);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/pc/PcBusMainDepositRest.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busmaindeposit.pc;
 
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
 import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
 import com.yxt.common.core.query.PagerQuery;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/28 14:21
@@ -31,4 +34,9 @@ public class PcBusMainDepositRest implements PcBusMainDepositFeign {
         PagerVo<PcBusMainDepositVo> pv = busMainDepositService.orderPageList(pagerQuery);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean<List<String>> selectVehicleList(PcBusMainDepositVehicleQuery query) {
+        return busMainDepositService.selectVehicleList(query);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.portal.biz.sysuser;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.syspost.SysPost;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
@@ -30,7 +29,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -319,7 +320,7 @@ public class SysUserRest implements SysUserFeign {
         String verifyCode = userQuery.getVerifyCode();
         String uuid = userQuery.getUuid();
         String captcha = redisUtil.get(uuid);
-        List<Map> list = JSONObject.parseArray(captcha, Map.class);
+       /* List<Map> list = JSONObject.parseArray(captcha, Map.class);
 
          if (StringUtils.isEmpty(verifyCode)) {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
@@ -387,7 +388,7 @@ public class SysUserRest implements SysUserFeign {
         } else {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
         }
-
+*/
         if (StringUtils.isBlank(userName)) {
             return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
         }