修改

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

@@ -71,6 +71,11 @@ public class HyBindCarCaptainInfo extends BaseModel<HyBindCarCaptainInfo> {
      */
     @TableField(exist = false)
     private String examineFlag;
+    /**
+     * 后台管理查询（1是）
+     */
+    @TableField(exist = false)
+    private String houtaiSearch;
 
     @Override
     protected Serializable pkVal() {

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

@@ -138,7 +138,6 @@ public class HyCarCaptainInfo extends BaseModel<HyCarCaptainInfo> {
     @TableField(exist = false)
     private String searchType;
 
-
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -321,6 +321,16 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
      */
     @TableField(exist = false)
     private Integer disabledDays;
+    /**
+     * 车队长姓名
+     */
+    @TableField(exist = false)
+    private String carCaptainName;
+    /**
+     * 车队长账号
+     */
+    @TableField(exist = false)
+    private String carCaptainAccountNumber;
 
     @TableField(exist = false)
     private String token;

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

@@ -154,6 +154,7 @@ public class HyBindCarCaptainInfoServiceImpl extends ServiceImpl<HyBindCarCaptai
         pageView.put("startRecord", (hyBindCarCaptainInfo.getCurrentPage() - 1)
                 * hyBindCarCaptainInfo.getPageSize());
         //用户id
+        pageView.put("houtaiSearch", hyBindCarCaptainInfo.getHoutaiSearch());
         pageView.put("carCaptainCommonId", hyBindCarCaptainInfo.getCarCaptainCommonId());
         pageView.put("pageSize", hyBindCarCaptainInfo.getPageSize());
         pageView.put("currentPage", hyBindCarCaptainInfo.getCurrentPage());

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

@@ -82,10 +82,13 @@
         d.back_stage_status_key as backStageStatusKey,
         case when d.back_stage_status is null then '未认证' else d.back_stage_status end as backStageStatus,
         d.pass_once as passOnce,
+        b.car_captain_name as carCaptainName,
+        b.car_captain_account_number as carCaptainAccountNumber,
         d.create_date as createDate,
         d.update_date as updateDate
         FROM common_user c
         LEFT JOIN hy_driver_info d on c.id = d.common_id and d.delete_flag = 0
+        LEFT JOIN hy_bind_car_captain_info b on c.id = b.common_id and  b.delete_flag = 0 and b.status_key = '5'
         WHERE c.delete_flag = '0'
         AND c.identification = '1'
         <if test="searchType != null and searchType != ''">

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

@@ -10,6 +10,11 @@
         WHERE
         delete_flag = '0'
         AND car_captain_common_id = #{carCaptainCommonId}
+        <if test="houtaiSearch != null and houtaiSearch != ''">
+            <if test="houtaiSearch == 1">
+                AND status_key = '5'
+            </if>
+        </if>
     </select>
 
     <!-- 绑定司机列表查询 -->
@@ -29,6 +34,11 @@
         WHERE
         delete_flag = '0'
         AND car_captain_common_id = #{carCaptainCommonId}
+        <if test="houtaiSearch != null and houtaiSearch != ''">
+            <if test="houtaiSearch == 1">
+                AND status_key = '5'
+            </if>
+        </if>
         ORDER BY create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

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

@@ -47,6 +47,7 @@
         order_no as orderNo,
         freight_advance as freightAdvance,
         driver_name as driverName,
+        payee_name as payeeName,
         bank_card as bankCard,
         bank_deposit as bankDeposit,
         bank_deposit_branch as bankDepositBranch,