销售订单-销售虚拟订单订金分页列表接口

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

@@ -0,0 +1,27 @@
+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/5/12 9:22
+ * @Description
+ */
+@Data
+public class PcBusDepositQuery implements Query {
+    private static final long serialVersionUID = -8450815150713107831L;
+
+    @ApiModelProperty(value = "付款人姓名")
+    private String draweeName;
+    @ApiModelProperty(value = "创建开始日期")
+    private String createDateStart;
+    @ApiModelProperty(value = "创建结束日期")
+    private String createDateEnd;
+
+    @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/busmaindeposit/pc/PcBusDepositVo.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.buscenter.api.busmaindeposit.pc;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/11 16:13
+ * @Description
+ */
+@Data
+public class PcBusDepositVo implements Vo {
+    private static final long serialVersionUID = 8256642059267742328L;
+
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
+
+    @ApiModelProperty(value = "单据类型")
+    private String depositBillType;
+
+    @ApiModelProperty(value = "单据编号")
+    private String billNo;
+    @ApiModelProperty(value = "制单日期")
+    private String createDate;
+    @ApiModelProperty(value = "销售专员")
+    private String staffName;
+
+    @ApiModelProperty(value = "客户付款人")
+    private String draweeName;
+    @ApiModelProperty(value = "联系电话")
+    private String draweeMobile;
+    @ApiModelProperty(value = "订金")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String deposit;
+    @ApiModelProperty(value = "已使用订金")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String usedDeposit;
+    @ApiModelProperty(value = "预定车辆")
+    private Integer vehicleNum;
+
+
+}

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

@@ -35,5 +35,8 @@ public interface PcBusMainDepositFeign {
     @ApiOperation(value = "销售订单-查询配置该业务员该客户选择的该车型及配置下的所有车辆的集合")
     ResultBean<List<String>> selectVehicleList(@SpringQueryMap PcBusMainDepositVehicleQuery query);
 
-
+    @ResponseBody
+    @PostMapping(value = "/depositPageList")
+    @ApiOperation(value = "销售订单-虚拟订单订金分页列表")
+    ResultBean<PagerVo<PcBusDepositVo>> depositPageList(@RequestBody PagerQuery<PcBusDepositQuery> query);
 }

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

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
+import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusDepositVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -115,4 +116,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
      * @return
      */
     List<String> selectVehicleList(@Param("modelSid") String modelSid, @Param("modelConfigSid") String modelConfigSid, @Param("staffSid") String staffSid, @Param("customerSid") String customerSid);
+
+    IPage<PcBusDepositVo> depositPageList(IPage<BusMainDeposit> page,  @Param(Constants.WRAPPER)QueryWrapper<BusMainDeposit> qw);
 }

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

@@ -149,7 +149,7 @@
 
     <select id="orderPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo">
         select bv.brandName,
-               bv.modelName as modelAlias,
+               bv.modelName        as modelAlias,
                bv.modelotherConfig as config,
                bv.modelSid,
                bv.modelConfigSid
@@ -172,4 +172,21 @@
           and bd.staffSid = #{staffSid}
           and bd.depositBillTypeKey = '02'
     </select>
+
+    <select id="depositPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusDepositVo">
+        select bmd.nodeState,
+               bmd.depositBillType,
+               bmd.billNo,
+               bmd.createDate,
+               bmd.staffName,
+               bd.draweeName,
+               bd.draweeMobile,
+               bd.deposit,
+               bd.usedDeposit,
+               bd.vehicleNum
+        from bus_main_deposit bmd
+                 left join bus_deposit bd on bd.billSid = bmd.sid
+                 left join bus_deposit_customer bc on bc.billSid = bmd.sid
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -42,9 +42,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicle;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer;
 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.*;
-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;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
@@ -187,7 +185,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         IPage<BusMainDepositListVo> pagging = baseMapper.selectPageVo(page, qw);
         List<BusMainDepositListVo> list = pagging.getRecords();
         for (BusMainDepositListVo vo : list) {
-                ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid());
+            ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(vo.getSid());
             if (resultBean.getSuccess() && resultBean.getData() != null) {
                 SysFormStateVo formState = resultBean.getData();
                 vo.setNodeState(formState.getNodeState());
@@ -1484,7 +1482,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         qw.eq("bd.staffSid", query.getStaffSid());
         qw.eq("bc.customerSid", query.getCustomerSid());
-        qw.eq("bd.state",1);
+        qw.eq("bd.state", 1);
         qw.groupBy("bv.modelSid", "bv.modelConfigSid");
         return qw;
     }
@@ -1501,4 +1499,30 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         return rb.success().setData(stringList);
     }
+
+    public PagerVo<PcBusDepositVo> depositPageList(PagerQuery<PcBusDepositQuery> pagerQuery) {
+        PcBusDepositQuery query = pagerQuery.getParams();
+        QueryWrapper<BusMainDeposit> qw = createDepositPageWrapper(query);
+        IPage<BusMainDeposit> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<PcBusDepositVo> pagging = baseMapper.depositPageList(page, qw);
+        PagerVo<PcBusDepositVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    private QueryWrapper<BusMainDeposit> createDepositPageWrapper(PcBusDepositQuery query) {
+        QueryWrapper<BusMainDeposit> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getDraweeName())) {
+                qw.like("bd.draweeName", query.getDraweeName());
+            }
+            if (StringUtils.isNotBlank(query.getCreateDateStart()) && StringUtils.isNotBlank(query.getCreateDateEnd())) {
+                qw.between("bmd.createDate", query.getCreateDateStart(), query.getCreateDateEnd());
+            }
+        }
+        qw.eq("bd.staffSid", query.getStaffSid());
+        qw.eq("bc.customerSid", query.getCustomerSid());
+        qw.eq("bd.state", 1);
+        qw.eq("bmd.depositBillTypeKey", "01");
+        return qw;
+    }
 }

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

@@ -1,9 +1,6 @@
 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.*;
-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;
 import com.yxt.common.core.result.ResultBean;
@@ -39,4 +36,11 @@ public class PcBusMainDepositRest implements PcBusMainDepositFeign {
     public ResultBean<List<String>> selectVehicleList(PcBusMainDepositVehicleQuery query) {
         return busMainDepositService.selectVehicleList(query);
     }
+
+    @Override
+    public ResultBean<PagerVo<PcBusDepositVo>> depositPageList(PagerQuery<PcBusDepositQuery> query) {
+        ResultBean<PagerVo<PcBusDepositVo>> rb = ResultBean.fireFail();
+        PagerVo<PcBusDepositVo> pv = busMainDepositService.depositPageList(query);
+        return rb.success().setData(pv);
+    }
 }