修改

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

@@ -26,7 +26,7 @@ public class CargoOwnerInfoController {
 
 
     /**
-     * huozhu 管理页面列表
+     * 货主管理页面列表
      * @param cargoOwnerInfo
      * @return
      */
@@ -66,7 +66,7 @@ public class CargoOwnerInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody CargoOwnerInfo cargoOwnerInfo){
+    public String examine( CargoOwnerInfo cargoOwnerInfo){
         return cargoOwnerInfoService.examine(cargoOwnerInfo);
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.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.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,11 +26,11 @@ public class DriverCarInfoController {
     private IDriverCarInfoService driverCarInfoService;
 
     /**
-     * 车辆列表
+     * 后台管理车辆列表
      * @return
      */
-    @PostMapping("/selectCar")
-    public List<DriverCarInfo> selectCar(@RequestBody DriverCarInfo driverCarInfo){
+    @GetMapping("/selectCar")
+    public Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo){
         return driverCarInfoService.selectCar(driverCarInfo);
     }
 
@@ -72,7 +74,7 @@ public class DriverCarInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody DriverCarInfo driverCarInfo){
+    public String examine( DriverCarInfo driverCarInfo){
         return driverCarInfoService.examine(driverCarInfo);
     }
 }

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

@@ -67,7 +67,7 @@ public class DriverInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody DriverInfo driverInfo){
+    public String examine( DriverInfo driverInfo){
         return driverInfoService.examine(driverInfo);
     }
 

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

@@ -39,7 +39,7 @@ public class NewsInfoController {
      * @return
      */
     @PostMapping("/api/addNewsInfo")
-    public String addNewsInfo (@RequestBody NewsInfo newsInfo){
+    public String addNewsInfo ( NewsInfo newsInfo){
         return newsInfoService.addNewsInfo(newsInfo);
     }
 

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

@@ -64,6 +64,10 @@ public class AgentCargoOwnerInfo extends BaseModel<AgentCargoOwnerInfo> {
      * 状态
      */
     private String status;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
     /**
      * 授权操作标识（1授权2驳回3撤销授权）
      */

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

@@ -66,7 +66,7 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      */
     private String cardValidityDate;
     /**
-     * 认证状态key（1审核中3已驳回5已通过）
+     * 认证状态key（1审核中3已驳回5已通过7禁用）
      */
     private String authenticationStatusKey;
     /**
@@ -77,6 +77,10 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      * 刷新次数
      */
     private Long refreshTimes;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
 
     @TableField(exist = false)
     private List<CargoOwnerCompInfo> cargoOwnerCompInfoList;
@@ -98,6 +102,11 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
 
     @Override
     protected Serializable pkVal() {

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

@@ -111,6 +111,10 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
      * 认证状态
      */
     private String status;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
 
     /**
      * 模糊查询

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

@@ -84,11 +84,55 @@ public class DriverCarInfo extends BaseModel<DriverCarInfo> {
      * 认证状态
      */
     private String status;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
     /**
      * 模糊查询
      */
     @TableField(exist = false)
-    private String search;
+    private String searchKeyWord;
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
+    /**
+     * 司机姓名
+     */
+    @TableField(exist = false)
+    private String driverName;
+    /**
+     * 司机电话
+     */
+    @TableField(exist = false)
+    private String driverPhone;
+    /**
+     * 司机身份证号码
+     */
+    @TableField(exist = false)
+    private String numberCard;
+    /**
+     * 身份证人像面附件地址
+     */
+    @TableField(exist = false)
+    private String cardAddressUrl;
+    /**
+     * 身份证国徽面面附件地址
+     */
+    @TableField(exist = false)
+    private String cardBackAddressUrl;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
 
     @Override
     protected Serializable pkVal() {

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

@@ -207,12 +207,17 @@ public class DriverInfo extends BaseModel<DriverInfo> {
      */
     @TableField(exist = false)
     private String searchType;
-
     /**
      * 模糊查询
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -41,6 +41,10 @@ public class NewsInfo extends BaseModel<NewsInfo> {
      * 接收消息用户id
      */
     private String reCommonId;
+    /**
+     * 消息标题
+     */
+    private String newsTitle;
     /**
      * 消息内容
      */

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

@@ -158,6 +158,10 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 终止原因描述
      */
     private String terminationReasonDescription;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
 
 
     /**

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

@@ -192,6 +192,10 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
      * 刷新次数
      */
     private String refreshTimes;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
 
     /**
      * 司机用户id

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

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 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 DriverCarInfoMapper extends BaseMapper<DriverCarInfo> {
 
+    /**
+     * 根据条件查询车辆总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询车辆列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<DriverCarInfo> getListByCondition(Map<String, Object> pageView);
 }

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

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -20,7 +21,7 @@ public interface IDriverCarInfoService extends IService<DriverCarInfo> {
      * @param driverCarInfo
      * @return
      */
-    List<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo);
+    Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo);
 
     /**
      * 司机车辆列表

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

@@ -145,10 +145,7 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
         List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList1= new ArrayList<>();
         if(!CollectionUtils.isEmpty(cargoOwnerAddressInfoList)){
             for (CargoOwnerAddressInfo cargoOwnerAddressInfo1 : cargoOwnerAddressInfoList){
-                if("1".equals(cargoOwnerAddressInfo1.getDefaultShipment())){
-                    cargoOwnerAddressInfoList1.add(cargoOwnerAddressInfo1);
-                }
-                if("1".equals(cargoOwnerAddressInfo1.getDefaultReceipt())){
+                if("1".equals(cargoOwnerAddressInfo1.getDefaultShipment()) || "1".equals(cargoOwnerAddressInfo1.getDefaultReceipt())){
                     cargoOwnerAddressInfoList1.add(cargoOwnerAddressInfo1);
                 }
             }

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

@@ -53,12 +53,12 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
                 * cargoOwnerInfo.getPageSize());
         //公司id
 //        pageView.put("compId", cargoOwnerInfo.getCompId());
-        pageView.put("commonId", cargoOwnerInfo.getCommonId());
+//        pageView.put("commonId", cargoOwnerInfo.getCommonId());
         pageView.put("searchType", cargoOwnerInfo.getSearchType());
         pageView.put("searchKeyWord", cargoOwnerInfo.getSearchKeyWord());
         pageView.put("pageSize", cargoOwnerInfo.getPageSize());
         pageView.put("currentPage", cargoOwnerInfo.getCurrentPage());
-        // 查询司机总数
+        // 查询货主总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<CargoOwnerInfo> dataList = baseMapper.getListByCondition(pageView);
         Page<CargoOwnerInfo> page = new Page<>();
@@ -163,6 +163,7 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             else if("2".equals(cargoOwnerInfo.getFlag())){
                 cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(cargoOwnerInfo);
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());

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

@@ -1,9 +1,12 @@
 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.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -14,7 +17,9 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,20 +33,29 @@ import java.util.List;
 public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, DriverCarInfo> implements IDriverCarInfoService {
 
     /**
-     *车辆列表
+     *后台管理车辆列表
      * @param driverCarInfo
      * @return
      */
     @Override
-    public List<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo) {
-        EntityWrapper<DriverCarInfo> driverCarInfoEntityWrapper = new EntityWrapper<>();
-        driverCarInfoEntityWrapper
-                .eq(DriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                .eq("status_key",driverCarInfo.getStatusKey())
-                .like("car_number",driverCarInfo.getSearch());
-//        .and("car_number like "+ driverCarInfo.getSearch()+"or ");
-        List<DriverCarInfo> driverCarInfoList = this.selectList(driverCarInfoEntityWrapper);
-        return driverCarInfoList;
+    public Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (driverCarInfo.getCurrentPage() - 1)
+                * driverCarInfo.getPageSize());
+        //公司id
+        pageView.put("searchType", driverCarInfo.getSearchType());
+        pageView.put("searchKeyWord", driverCarInfo.getSearchKeyWord());
+        pageView.put("pageSize", driverCarInfo.getPageSize());
+        pageView.put("currentPage", driverCarInfo.getCurrentPage());
+        // 查询车辆总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<DriverCarInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<DriverCarInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(driverCarInfo.getCurrentPage());
+        page.setSize(driverCarInfo.getPageSize());
+        return page;
     }
 
     /**
@@ -121,6 +135,41 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
         //查询车辆信息
         DriverCarInfo driverCarInfo1 = this.selectById(driverCarInfo.getId());
         if (driverCarInfo1 != null) {
+            //通过
+            if ("1".equals(driverCarInfo.getFlag())) {
+                driverCarInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                driverCarInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+//                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
+//                UnimallMessage messageDO = new UnimallMessage();
+//                messageDO.setAdminId(commonUser.getId());
+//                messageDO.setCustomer(commonUser.getUserName());
+//                messageDO.setOperation("审核通知");
+//                messageDO.setResult("您的司机认证申请已审核通过");
+//                messageDO.setGmtUpdate(new java.util.Date());
+//                messageDO.setGmtCreate(new Date());
+//                messageDO.setTaskId(IdGenerator.generateUUID());
+//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+//                messageDO.setPath("XXXXX");
+//                webSocket.sendOneMessage(messageDO);
+            }
+            //驳回
+            else if("2".equals(driverCarInfo.getFlag())){
+                driverCarInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                driverCarInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(driverCarInfo);
+//                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
+//                UnimallMessage messageDO = new UnimallMessage();
+//                messageDO.setAdminId(commonUser.getId());
+//                messageDO.setCustomer(commonUser.getUserName());
+//                messageDO.setOperation("驳回通知");
+//                messageDO.setResult("您的司机认证申请已被驳回");
+//                messageDO.setGmtUpdate(new java.util.Date());
+//                messageDO.setGmtCreate(new Date());
+//                messageDO.setTaskId(IdGenerator.generateUUID());
+//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+//                messageDO.setPath("XXXXX");
+//                webSocket.sendOneMessage(messageDO);
+            }
             //更改车辆状态信息
             this.updateById(driverCarInfo1);
             return "OK";

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

@@ -7,7 +7,7 @@
     <!-- 获得货主总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
-        count(1)
+        count(id)
         FROM cargo_owner_info
         WHERE
         delete_flag = '0'
@@ -37,41 +37,41 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo">
         SELECT
-        id,
-        name
-        common_id as commonId,
-        comp_id as compId,
-        card_address_url as cardAddressUrl,
-        card_back_address_url as cardBackAddressUrl,
-        phone ,
-        card_number as cardNumber,
-        card_validity_date as cardValidityDate,
-        disable_status_flag as disableStatusFlag,
-        authentication_status_key as authenticationStatusKey,
-        authentication_status as authenticationStatus,
-        update_date as updateDate
-        FROM cargo_owner_info
-        WHERE
-        delete_flag = '0'
+        c.id,
+        c.name,
+        c.common_id as commonId,
+        c.comp_id as compId,
+        c.card_address_url as cardAddressUrl,
+        c.card_back_address_url as cardBackAddressUrl,
+        c.phone,
+        c.card_number as cardNumber,
+        c.card_validity_date as cardValidityDate,
+        c.authentication_status_key as authenticationStatusKey,
+        c.authentication_status as authenticationStatus,
+        c.update_date as updateDate,
+        cu.avatar_url as avatarUrl
+        FROM cargo_owner_info c
+        LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND authentication_status_key = '1'
+                AND c.authentication_status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND authentication_status_key = '3'
+                AND c.authentication_status_key = '3'
             </if>
             <if test="searchType == 3">
-                AND authentication_status_key = '5'
+                AND c.authentication_status_key = '5'
             </if>
             <if test="searchType == 4">
-                AND authentication_status_key = '7'
+                AND c.authentication_status_key = '7'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(c.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        ORDER BY d.update_date DESC
+        ORDER BY c.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -1,107 +1,66 @@
 <?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.yh.saas.plugin.yiliangyiyun.mapper.DriverCarInfoMapper">
-    <!-- 获得司机总数 -->
+    <!-- 获得车辆总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
-        count(1)
-        from(
-        SELECT
-        d.id
+        count(c.id)
         FROM driver_info d
-        left join driver_car_info c on d.id=c.driver_id
-        left join driver_payee_info p on d.id=p.driver_id
-        WHERE
-        d.delete_flag = '0'
-        <if test="residentCityProvincial != null and residentCityProvincial != ''">
-            AND d.resident_city_provincial = #{residentCityProvincial}
-        </if>
-        <if test="residentCityMunicipal != null and residentCityMunicipal != ''">
-            AND d.resident_city_municipal = #{residentCityMunicipal}
-        </if>
+        left join driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
+        WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND d.authentication_status_key = '1'
+                AND c.status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND d.authentication_status_key = '7'
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(c.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        <if test="pcFlag != null and pcFlag != ''">
-            <if test="pcFlag == 0">
-                AND d.common_id = #{commonId}
-            </if>
-            <if test="pcFlag == 1">
-                AND d.comp_id = #{compId}
-            </if>
-        </if>
-        group by
-        d.id
-        ) t
-
     </select>
-    <!-- 司机列表查询 -->
+    <!-- 车辆列表查询 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo">
         SELECT
-        d.id,
+        c.id,
         d.driver_name as driverName,
-        d.cover,
-        d.number_card as numberCard,
         d.driver_phone as driverPhone,
-        d.resident_city_provincial as residentCityProvincial,
-        d.resident_city_municipal as residentCityMunicipal,
-        d.disable_status_flag as disableStatusFlag,
-        d.authentication_status_key as authenticationStatusKey,
-        d.authentication_status as authenticationStatus,
-        d.disable_reasons as disableReasons,
-        d.address_url as addressUrl,
+        d.number_card as numberCard,
+        c.car_number as carNumber,
+        c.address_url as addressUrl,
         d.card_address_url as cardAddressUrl,
-        p.payee_address_url as payeeAddressUrl,
-        p.card_address_url as cardAddressUrl1,
-        d.update_date as updateDate
+        d.card_back_address_url as cardBackAddressUrl,
+        c.status,
+        c.update_date as updateDate,
+        cu.avatar_url as avatarUrl
         FROM driver_info d
-        left join driver_car_info c on d.id=c.driver_id
-        left join driver_payee_info p on d.id=p.driver_id
-        WHERE
-        d.delete_flag = '0'
-        <if test="residentCityProvincial != null and residentCityProvincial != ''">
-            AND d.resident_city_provincial = #{residentCityProvincial}
-        </if>
-        <if test="residentCityMunicipal != null and residentCityMunicipal != ''">
-            AND d.resident_city_municipal = #{residentCityMunicipal}
-        </if>
+        left join driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
+        LEFT JOIN common_user cu on cu.id = d.common_id and cu.delete_flag = 0
+        WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND d.authentication_status_key = '1'
+                AND c.status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND d.authentication_status_key = '7'
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(c.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        <if test="pcFlag != null and pcFlag != ''">
-            <if test="pcFlag == 0">
-                AND d.common_id = #{commonId}
-            </if>
-            <if test="pcFlag == 1">
-                AND d.comp_id = #{compId}
-            </if>
-        </if>
-        group by
-        d.id
-        ORDER BY d.update_date DESC
+        ORDER BY c.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -6,7 +6,7 @@
     <!-- 获得司机总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
     select
-    count(1)
+    count(id)
     FROM driver_info
     WHERE
     delete_flag = '0'
@@ -39,6 +39,7 @@
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo">
         SELECT
         d.id,
+        d.common_id as commonId,
         d.driver_name as driverName,
         d.driver_phone as driverPhone,
         d.number_card as numberCard,
@@ -56,8 +57,10 @@
         d.authentication_status_key as authenticationStatusKey,
         d.authentication_status as authenticationStatus,
         d.create_date as createDate,
-        d.update_date as updateDate
+        d.update_date as updateDate,
+        c.avatar_url as avatarUrl
         FROM driver_info d
+        LEFT JOIN common_user c on c.id = d.common_id and c.delete_flag = 0
         WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">

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

@@ -19,6 +19,7 @@
         id,
         crt_common_id as crtCommonId,
         re_common_id as reCommonId,
+        news_title as newsTitle,
         news_content as newsContent,
         number as number,
         news_type_key as newsTypeKey,