pc端付款申请的车辆选择分页列表

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

@@ -317,6 +317,10 @@ public interface BaseVehicleFeign {
     @PostMapping("/selectCostVehicleList")
     ResultBean<PagerVo<VehicleCostListVo>> selectCostVehicleList(@RequestBody PagerQuery<VehicleCostListQuery> pagerQuery);
 
+    @ApiOperation("付款申请选择车辆分页列表")
+    @PostMapping("/selectPayVehicleList")
+    ResultBean<PagerVo<PayBaseVehicleVo>>  selectPayVehicleList(@RequestBody PagerQuery<PayBaseVehicleQuery> pagerQuery);
+
     @ApiOperation("入库根据车架号更改车辆台账数据")
     @PostMapping("/updateVehicleEnterlibraryByVin")
     ResultBean updateVehicleEnterlibraryByVin(@RequestBody VehicleEnterlibrary vehicleEnterlibrary);

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

@@ -218,6 +218,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<PayBaseVehicleVo>> selectPayVehicleList(PagerQuery<PayBaseVehicleQuery> pagerQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean updateVehicleEnterlibraryByVin(VehicleEnterlibrary vehicleEnterlibrary) {
         return null;

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

@@ -0,0 +1,27 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/8 11:21
+ * @Description
+ */
+@Data
+public class PayBaseVehicleQuery implements Query {
+    private static final long serialVersionUID = 8939482367294270164L;
+
+    @ApiModelProperty(value = "已选择的车辆的sid")
+    private List<String> sidList = new ArrayList<>();
+
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+}

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

@@ -0,0 +1,28 @@
+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/10/8 11:16
+ * @Description
+ */
+@Data
+public class PayBaseVehicleVo implements Vo {
+    private static final long serialVersionUID = 8935506131970564858L;
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("车辆sid")
+    private String vehSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("厂家结算价")
+    private String costPrice;
+}

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

@@ -464,4 +464,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}")
     void updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
+
+    IPage<PayBaseVehicleVo> selectPayVehicleList(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

@@ -1182,4 +1182,11 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectPayVehicleList" resultType="com.yxt.anrui.base.api.basevehicle.PayBaseVehicleVo">
+        select bv.vinNo,bv.modelName,bv.modelSid,bv.modelConfigSid configSid,bv.sid vehSid,bv.costPrice from base_vehicle bv
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -636,6 +636,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<PayBaseVehicleVo>> selectPayVehicleList(PagerQuery<PayBaseVehicleQuery> pagerQuery) {
+        ResultBean<PagerVo<PayBaseVehicleVo>> rb = ResultBean.fireFail();
+        PagerVo<PayBaseVehicleVo> pv = baseVehicleService.selectPayVehicleList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean updateVehicleEnterlibraryByVin(VehicleEnterlibrary vehicleEnterlibrary) {
         return baseVehicleService.updateVehicleEnterlibraryByVin(vehicleEnterlibrary);

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

@@ -2647,4 +2647,27 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         baseMapper.updateVehRemarks(remarks,sid);
         return rb.success().setMsg("备注修改成功");
     }
+
+    public PagerVo<PayBaseVehicleVo> selectPayVehicleList(PagerQuery<PayBaseVehicleQuery> pagerQuery) {
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(pagerQuery);
+        PayBaseVehicleQuery query = pagerQuery.getParams();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        //本分公司、非删除、库存状态为非在途非调入。
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
+                qw.eq("bv.useOrgSid", resultBean.getData());
+            }
+            if (query.getSidList().size() > 0) {
+                qw.notIn("bv.vinNo", query.getSidList());
+            }
+            if (StringUtils.isNotBlank(query.getVinNo())) {
+                qw.like("bv.vinNo", query.getVinNo());
+            }
+            qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+        }
+        IPage<PayBaseVehicleVo> pagging = baseMapper.selectPayVehicleList(page, qw);
+        PagerVo<PayBaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }