1

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -96,6 +96,10 @@ auth:
     - /hyOperLog/**/*
     - /hyFreightSettlementInfo/*
     - /hyFreightSettlementInfo/**/*
+    - /hyCarCaptainInfo/*
+    - /hyCarCaptainInfo/**/*
+    - /hyBindCarCaptainInfo/*
+    - /hyBindCarCaptainInfo/**/*
     - /hyOrderTravelPath/*
     - /hyOrderTravelPath/**/*
     - /publishTaskInfo/*

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyBindCarCaptainInfoController.java

@@ -8,11 +8,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.IHyBindCarCaptainInfoService;
 
 import com.yh.saas.plugin.yiliangyiyun.util.Log;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -69,8 +65,8 @@ public class HyBindCarCaptainInfoController {
      * 绑定车队长查看页面
      */
     @Log(title = "绑定车队长查看页面")
-    @PostMapping("/api/getBindCarCaptain")
-    public HyBindCarCaptainInfo getBindCarCaptain(@RequestBody HyBindCarCaptainInfo hyBindCarCaptainInfo){
+    @GetMapping("/getBindCarCaptain")
+    public HyBindCarCaptainInfo getBindCarCaptain(HyBindCarCaptainInfo hyBindCarCaptainInfo){
         return hyBindCarCaptainInfoService.getBindCarCaptain(hyBindCarCaptainInfo);
     }
 
@@ -78,8 +74,8 @@ public class HyBindCarCaptainInfoController {
      * 车队管理绑定司机列表
      */
     @Log(title = "车队管理绑定司机列表")
-    @PostMapping("/api/selectPage")
-    public Page<HyBindCarCaptainInfo> selectPage(@RequestBody HyBindCarCaptainInfo hyBindCarCaptainInfo){
+    @GetMapping("/api/selectPage")
+    public Page<HyBindCarCaptainInfo> selectPage(HyBindCarCaptainInfo hyBindCarCaptainInfo){
         return hyBindCarCaptainInfoService.selectPage(hyBindCarCaptainInfo);
     }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyCarCaptainInfoController.java

@@ -1,6 +1,8 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBindCarCaptainInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyCarCaptainInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IHyCarCaptainInfoService;
@@ -65,5 +67,14 @@ public class HyCarCaptainInfoController {
     HyCarCaptainInfo getCarCaptain(HyCarCaptainInfo hyCarCaptainInfo){
         return hyCarCaptainInfoService.getCarCaptain(hyCarCaptainInfo);
     }
+
+    /**
+     * 后台管理车队长信息列表
+     */
+    @Log(title = "后台管理车队长信息列表")
+    @GetMapping("/api/selectCarCaptainPage")
+    public Page<HyCarCaptainInfo> selectCarCaptainPage(@RequestBody HyCarCaptainInfo hyCarCaptainInfo){
+        return hyCarCaptainInfoService.selectCarCaptainPage(hyCarCaptainInfo);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyFreightSettlementInfoController.java

@@ -38,6 +38,17 @@ public class HyFreightSettlementInfoController {
         return hyFreightSettlementInfoService.selectFreightSettlement(hyFreightSettlementInfo);
     }
 
+    /**
+     * 车队长账单列表
+     *
+     * @param hyFreightSettlementInfo
+     * @return
+     */
+    @GetMapping("/selectFleetCaptainBill")
+    public Page<HyFreightSettlementInfo> selectFleetCaptainBill(HyFreightSettlementInfo hyFreightSettlementInfo) {
+        return hyFreightSettlementInfoService.selectFleetCaptainBill(hyFreightSettlementInfo);
+    }
+
     /**
      * 后台管理司机运费结算暂缓支付
      *

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCarCaptainInfo.java

@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -62,6 +64,8 @@ public class HyCarCaptainInfo extends BaseModel<HyCarCaptainInfo> {
     /**
      * 身份证起始有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date cardValidityStartDate;
     /**
      * 身份证截止有效期
@@ -98,6 +102,8 @@ public class HyCarCaptainInfo extends BaseModel<HyCarCaptainInfo> {
     /**
      * 道路运输经营许可证有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date roadTransportOperationLicenseValidityDate;
     /**
      * 状态key（1审核中3已驳回5已认证）
@@ -107,12 +113,30 @@ public class HyCarCaptainInfo extends BaseModel<HyCarCaptainInfo> {
      * 状态
      */
     private String status;
+    /**
+     * 后台管理状态key（1待审核3已驳回5已通过）
+     */
+    private String backStageStatusKey;
+    /**
+     * 后台管理状态
+     */
+    private String backStageStatus;
 
     /**
      * 审核标识(1通过2驳回)
      */
     @TableField(exist = false)
     private String examineFlag;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 查询类型(1待审核2已通过3已驳回)
+     */
+    @TableField(exist = false)
+    private String searchType;
 
 
     @Override

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyFreightSettlementInfo.java

@@ -39,6 +39,10 @@ public class HyFreightSettlementInfo extends BaseModel<HyFreightSettlementInfo>
      * 司机用户id
      */
     private String commonId;
+    /**
+     * 车队长用户id
+     */
+    private String carCaptainCommonId;
     /**
      * 订单id
      */
@@ -206,6 +210,11 @@ public class HyFreightSettlementInfo extends BaseModel<HyFreightSettlementInfo>
      */
     @TableField(exist = false)
     private String driverAddress;
+    /**
+     *司机账号
+     */
+    @TableField(exist = false)
+    private String driverAccountNumber;
     /**
      *银行Key值
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -48,6 +48,10 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 司机用户id
      */
     private String commonId;
+    /**
+     * 车队长用户id
+     */
+    private String carCaptainCommonId;
     /**
      * 货主用户id
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyCarCaptainInfoMapper.java

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBindCarCaptainInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyCarCaptainInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录车队长信息 Mapper 接口
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface HyCarCaptainInfoMapper extends BaseMapper<HyCarCaptainInfo> {
 
+    /**
+     * 根据条件查询车队长总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询车队长列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<HyCarCaptainInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyFreightSettlementInfoMapper.java

@@ -34,6 +34,22 @@ public interface HyFreightSettlementInfoMapper extends BaseMapper<HyFreightSettl
      */
     List<HyFreightSettlementInfo> getListByCondition(Map<String, Object> pageView);
 
+    /**
+     * 根据条件查询车队长账单总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getFleetCaptainCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询车队长账单列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<HyFreightSettlementInfo> getFleetCaptainListByCondition(Map<String, Object> pageView);
+
     /**
      * 根据条件查询货主提现总数
      *

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyCarCaptainInfoService.java

@@ -1,8 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyCarCaptainInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -41,4 +43,11 @@ public interface IHyCarCaptainInfoService extends IService<HyCarCaptainInfo> {
      * @return
      */
     HyCarCaptainInfo getCarCaptain(HyCarCaptainInfo hyCarCaptainInfo);
+
+    /**
+     * 后台管理车队长信息列表
+     * @param hyCarCaptainInfo
+     * @return
+     */
+    Page<HyCarCaptainInfo> selectCarCaptainPage(HyCarCaptainInfo hyCarCaptainInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyFreightSettlementInfoService.java

@@ -24,6 +24,15 @@ public interface IHyFreightSettlementInfoService extends IService<HyFreightSettl
      * @return
      */
     Page<HyFreightSettlementInfo> selectFreightSettlement(HyFreightSettlementInfo hyFreightSettlementInfo);
+
+    /**
+     * 车队长账单列表
+     *
+     * @param hyFreightSettlementInfo
+     * @return
+     */
+    Page<HyFreightSettlementInfo> selectFleetCaptainBill(HyFreightSettlementInfo hyFreightSettlementInfo);
+
     /**
      * 后台管理司机运费结算暂缓支付
      *

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyBindCarCaptainInfoServiceImpl.java

@@ -72,10 +72,11 @@ public class HyBindCarCaptainInfoServiceImpl extends ServiceImpl<HyBindCarCaptai
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String unbinding(HyBindCarCaptainInfo hyBindCarCaptainInfo){
-        hyBindCarCaptainInfo.setStatusKey(StatusEnum.ALREADY_UNBIND.getFlag());
-        hyBindCarCaptainInfo.setStatus(StatusEnum.ALREADY_UNBIND.getName());
+        HyBindCarCaptainInfo hyBindCarCaptainInfo1 = this.selectById(hyBindCarCaptainInfo.getId());
+        hyBindCarCaptainInfo1.setStatusKey(StatusEnum.ALREADY_UNBIND.getFlag());
+        hyBindCarCaptainInfo1.setStatus(StatusEnum.ALREADY_UNBIND.getName());
         //主表信息编辑
-        this.updateById(hyBindCarCaptainInfo);
+        this.updateById(hyBindCarCaptainInfo1);
         return "OK";
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyCarCaptainInfoServiceImpl.java

@@ -1,14 +1,13 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.HyCarCaptainInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.NewsInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.HyCarCaptainInfoMapper;
@@ -24,9 +23,7 @@ import org.springframework.util.CollectionUtils;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -56,12 +53,14 @@ public class HyCarCaptainInfoServiceImpl extends ServiceImpl<HyCarCaptainInfoMap
         hyCarCaptainInfo.setId(IdGenerator.generateUUID());
         hyCarCaptainInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
         hyCarCaptainInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyCarCaptainInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+        hyCarCaptainInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
         //判断与司机信息身份证号是否一致
         HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
                         .eq("common_id", hyCarCaptainInfo.getCommonId())
                         .eq("delete_flag", NumberConstant.CONSTANT0));
         if (hyDriverInfo != null) {
-            if (hyDriverInfo.getNumberCard().equals(hyCarCaptainInfo.getIdCard())){
+            if (!hyDriverInfo.getNumberCard().equals(hyCarCaptainInfo.getIdCard())){
                 throw new YException(YExceptionEnum.ID_CARD_NOT_EQUALS);
             }
 
@@ -78,12 +77,14 @@ public class HyCarCaptainInfoServiceImpl extends ServiceImpl<HyCarCaptainInfoMap
     public String editCarCaptain(HyCarCaptainInfo hyCarCaptainInfo){
         hyCarCaptainInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
         hyCarCaptainInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyCarCaptainInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+        hyCarCaptainInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
         //判断与司机信息身份证号是否一致
         HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
                 .eq("common_id", hyCarCaptainInfo.getCommonId())
                 .eq("delete_flag", NumberConstant.CONSTANT0));
         if (hyDriverInfo != null) {
-            if (hyDriverInfo.getNumberCard().equals(hyCarCaptainInfo.getIdCard())){
+            if (!hyDriverInfo.getNumberCard().equals(hyCarCaptainInfo.getIdCard())){
                 throw new YException(YExceptionEnum.ID_CARD_NOT_EQUALS);
             }
 
@@ -110,11 +111,15 @@ public class HyCarCaptainInfoServiceImpl extends ServiceImpl<HyCarCaptainInfoMap
                 //更改状态
                 hyCarCaptainInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 hyCarCaptainInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyCarCaptainInfo1.setBackStageStatusKey(StatusEnum.FLEET_ADOPT.getFlag());
+                hyCarCaptainInfo1.setBackStageStatus(StatusEnum.FLEET_ADOPT.getName());
             }
             //驳回
             else if ("2".equals(hyCarCaptainInfo.getExamineFlag())) {
                 hyCarCaptainInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 hyCarCaptainInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                hyCarCaptainInfo1.setBackStageStatusKey(StatusEnum.FLEET_REJECT.getFlag());
+                hyCarCaptainInfo1.setBackStageStatus(StatusEnum.FLEET_REJECT.getName());
             }
             //更改信息
             this.updateById(hyCarCaptainInfo1);
@@ -134,4 +139,30 @@ public class HyCarCaptainInfoServiceImpl extends ServiceImpl<HyCarCaptainInfoMap
                 .eq("delete_flag","0"));
         return hyCarCaptainInfo1;
     }
+
+    /**
+     * 后台管理车队长信息列表
+     * @param hyCarCaptainInfo
+     * @return
+     */
+    @Override
+    public Page<HyCarCaptainInfo> selectCarCaptainPage(HyCarCaptainInfo hyCarCaptainInfo){
+        Map<String, Object> pageView = new HashMap<>(6);
+        pageView.put("startRecord", (hyCarCaptainInfo.getCurrentPage() - 1)
+                * hyCarCaptainInfo.getPageSize());
+        //用户id
+        pageView.put("searchKeyWord", hyCarCaptainInfo.getSearchKeyWord());
+        pageView.put("searchType", hyCarCaptainInfo.getSearchType());
+        pageView.put("pageSize", hyCarCaptainInfo.getPageSize());
+        pageView.put("currentPage", hyCarCaptainInfo.getCurrentPage());
+        // 查询银行卡总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<HyCarCaptainInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyCarCaptainInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(hyCarCaptainInfo.getCurrentPage());
+        page.setSize(hyCarCaptainInfo.getPageSize());
+        return page;
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyFreightSettlementInfoServiceImpl.java

@@ -90,6 +90,32 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
         return page;
     }
 
+    /**
+     * 车队长账单列表
+     *
+     * @param hyFreightSettlementInfo
+     * @return
+     */
+    @Override
+    public Page<HyFreightSettlementInfo> selectFleetCaptainBill(HyFreightSettlementInfo hyFreightSettlementInfo) {
+        Map<String, Object> pageView = new HashMap<>(8);
+        pageView.put("startRecord", (hyFreightSettlementInfo.getCurrentPage() - 1)
+                * hyFreightSettlementInfo.getPageSize());
+        //用户id
+        pageView.put("carCaptainCommonId", hyFreightSettlementInfo.getCarCaptainCommonId());
+        pageView.put("pageSize", hyFreightSettlementInfo.getPageSize());
+        pageView.put("currentPage", hyFreightSettlementInfo.getCurrentPage());
+        // 查询账单总数
+        Integer dataCount = baseMapper.getFleetCaptainCountByCondition(pageView);
+        List<HyFreightSettlementInfo> dataList = baseMapper.getFleetCaptainListByCondition(pageView);
+        Page<HyFreightSettlementInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(hyFreightSettlementInfo.getCurrentPage());
+        page.setSize(hyFreightSettlementInfo.getPageSize());
+        return page;
+    }
+
     /**
      * 后台管理司机运费结算暂缓支付
      *

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -1129,6 +1129,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         hyFreightSettlementInfo.setDriverName(orderInfo1.getDriverName());
                         hyFreightSettlementInfo.setPayeeName(orderInfo1.getPayeeName());
                         hyFreightSettlementInfo.setPayeeIdCard(orderInfo1.getPayeeIdCard());
+                        if (orderInfo1.getCarCaptainCommonId() != null && !orderInfo1.getCarCaptainCommonId().isEmpty()) {
+                            hyFreightSettlementInfo.setCarCaptainCommonId(orderInfo1.getCarCaptainCommonId());
+                        }
                         hyFreightSettlementInfo.setBankCard(orderInfo1.getBankCard());
                         hyFreightSettlementInfo.setBankDeposit(orderInfo1.getBankDeposit());
                         hyFreightSettlementInfo.setBankDepositBranch(orderInfo1.getBankDepositBranch());
@@ -1300,6 +1303,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     hyFreightSettlementInfo.setDriverName(orderInfo1.getDriverName());
                     hyFreightSettlementInfo.setPayeeName(orderInfo1.getPayeeName());
                     hyFreightSettlementInfo.setPayeeIdCard(orderInfo1.getPayeeIdCard());
+                    if (orderInfo1.getCarCaptainCommonId() != null && !orderInfo1.getCarCaptainCommonId().isEmpty()) {
+                        hyFreightSettlementInfo.setCarCaptainCommonId(orderInfo1.getCarCaptainCommonId());
+                    }
                     hyFreightSettlementInfo.setBankCard(orderInfo1.getBankCard());
                     hyFreightSettlementInfo.setBankDeposit(orderInfo1.getBankDeposit());
                     hyFreightSettlementInfo.setBankDepositBranch(orderInfo1.getBankDepositBranch());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -1506,6 +1506,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     .eq("status_key","5")
                     .eq("delete_flag","0"));
             if (hyCarCaptainInfo != null){
+                orderInfo.setCarCaptainCommonId(hyCarCaptainInfo.getCommonId());
                 orderInfo.setCarCaptainAccountNumber(hyCarCaptainInfo.getAccountNumber());
                 orderInfo.setPayeeName(hyCarCaptainInfo.getName());
                 orderInfo.setBankCard(hyCarCaptainInfo.getBankCard());

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyCarCaptainInfoMapper.xml

@@ -2,4 +2,73 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.HyCarCaptainInfoMapper">
 
+    <!-- 获得车队长总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM hy_car_captain_info
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND back_stage_status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND back_stage_status_key = '5'
+            </if>
+            <if test="searchType == 3">
+                AND back_stage_status_key = '3'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(account_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得车队长列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCarCaptainInfo">
+        SELECT
+        id,
+        common_id as commonId,
+        account_number as accountNumber,
+        card_address_url as cardAddressUrl,
+        card_back_address_url as cardBackAddressUrl,
+        id_card as idCard,
+        card_validity_start_date as cardValidityStartDate,
+        name,
+        card_validity_end_date as cardValidityEndDate,
+        payee_address_url as payeeAddressUrl,
+        bank_card as bankCard,
+        bank_deposit as bankDeposit,
+        bank_deposit_branch as bankDepositBranch,
+        payee_name as payeeName,
+        road_transport_operation_license as roadTransportOperationLicense,
+        road_transport_operation_license_no as roadTransportOperationLicenseNo,
+        road_transport_operation_license_validity_date as roadTransportOperationLicenseValidityDate,
+        back_stage_status_key as backStageStatusKey,
+        back_stage_status as backStageStatus,
+        create_date as createDate,
+        update_date as updateDate
+        FROM hy_car_captain_info
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND back_stage_status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND back_stage_status_key = '5'
+            </if>
+            <if test="searchType == 3">
+                AND back_stage_status_key = '3'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(account_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyFreightSettlementInfoMapper.xml

@@ -223,4 +223,48 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+
+
+    <!-- 获得车队长账单总数 -->
+    <select id="getFleetCaptainCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        select
+        count(id)
+        FROM hy_freight_settlement_info
+        WHERE
+        delete_flag = '0'
+        AND car_captain_common_id = #{carCaptainCommonId}
+    </select>
+
+    <!-- 车队长账单列表查询 -->
+    <select id="getFleetCaptainListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyFreightSettlementInfo">
+        SELECT
+        f.id,
+        f.order_id as orderId,
+        f.order_no as orderNo,
+        f.freight_advance as freightAdvance,
+        f.driver_name as driverName,
+        f.payee_name as payeeName,
+        f.bank_card as bankCard,
+        f.bank_deposit as bankDeposit,
+        f.bank_deposit_branch as bankDepositBranch,
+        f.payment_type as paymentType,
+        f.amount_money as amountMoney,
+        f.payment_date as paymentDate,
+        f.status_key as statusKey,
+        f.status,
+        c.phone as driverAccountNumber,
+        f.serial_number as serialNumber,
+        f.arrival_date as arrivalDate,
+        f.payment_voucher as paymentVoucher,
+        f.create_date as createDate
+        FROM hy_freight_settlement_info f
+        LEFT JOIN common_user c on f.common_id = c.id and c.delete_flag = 0 and c.identification = '1'
+        WHERE f.delete_flag = '0'
+        AND f.car_captain_common_id = #{carCaptainCommonId}
+        ORDER BY f.create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>