1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -189,6 +189,13 @@ public enum StatusEnum {
     TASK_REJECT("5", "已通过", "task_reject"),
     TASK_ADOPT("7", "已过期", "task_adopt"),
 
+    //所属公司状态
+    COMPANY_EXAMINEING("1", "企业审核中", "company_examineing"),
+    COMPANY_REJECTED("3", "企业已驳回", "company_rejected"),
+    PLATFORM_EXAMINEING("5", "平台审核中", "platform_examineing"),
+    PLATFORM_REJECTED("7", "平台已驳回", "platform_rejected"),
+    PLATFORM_CERTIFIED("9", "已认证", "platform_certified"),
+    CAUTHORIZATION_REVOKED("17", "授权已撤销", "authorization_revoked"),
 
     ;
     @Getter

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

@@ -1,15 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
 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>
@@ -51,6 +47,15 @@ public class CargoOwnerCompInfoController {
         cargoOwnerCompInfoService.deleteCargoOwnerComp(cargoOwnerCompInfo.getId());
     }
 
+    /**
+     * 授权审核管理页面列表
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    @GetMapping("/selectCargoOwnerCompInfoPage")
+    public Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo){
+        return cargoOwnerCompInfoService.selectCargoOwnerCompInfoPage(cargoOwnerCompInfo);
+    }
 
     /**
      * 审核
@@ -58,7 +63,7 @@ public class CargoOwnerCompInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
+    public String examine( CargoOwnerCompInfo cargoOwnerCompInfo){
         return cargoOwnerCompInfoService.examine(cargoOwnerCompInfo);
     }
 }

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

@@ -142,7 +142,7 @@ public class PublishTaskInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody PublishTaskInfo publishTaskInfo){
+    public String examine( PublishTaskInfo publishTaskInfo){
         return publishTaskInfoService.examine(publishTaskInfo);
     }
 }

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

@@ -65,7 +65,7 @@ public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
      */
     private String advanceFreightService;
     /**
-     * 认证状态key（1审核中3企业已驳回5已认证7未通过审核9授权已过期11企业变更授权失效）
+     * 认证状态key（1企业审核中3企业已驳回5平台审核中7平台已驳回审核9已认证11授权已过期13企业暂不可用15企业不存在17授权已撤销）
      */
     private String statusKey;
     /**
@@ -77,6 +77,36 @@ public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
      */
     @TableField(exist = false)
     private String flag;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
+    /**
+     * 货主姓名
+     */
+    @TableField(exist = false)
+    private String name;
+    /**
+     * 账号
+     */
+    @TableField(exist = false)
+    private String phone;
+    /**
+     * 身份证号
+     */
+    @TableField(exist = false)
+    private String cardNumber;
 
     @Override
     protected Serializable pkVal() {

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

@@ -55,6 +55,10 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
      * 注册实缴金额（万元）
      */
     private Float registeredPaidAmount;
+    /**
+     * 通信地址
+     */
+    private String mailingAddress;
     /**
      * 身份证人像面附件地址
      */

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

@@ -2,6 +2,10 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface CargoOwnerCompInfoMapper extends BaseMapper<CargoOwnerCompInfo> {
 
+    /**
+     * 根据条件查询所属公司总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询所属公司列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<CargoOwnerCompInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerCompInfoService.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.CargoOwnerCompInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -33,5 +34,17 @@ public interface ICargoOwnerCompInfoService extends IService<CargoOwnerCompInfo>
      */
     void deleteCargoOwnerComp(String id);
 
+    /**
+     * 授权审核后台管理
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo);
+
+    /**
+     * 审核
+     * @param cargoOwnerCompInfo
+     * @return
+     */
     String examine(CargoOwnerCompInfo cargoOwnerCompInfo);
 }

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

@@ -37,7 +37,17 @@ public interface ICargoOwnerInfoService extends IService<CargoOwnerInfo> {
      */
     String editCargoOwner(CargoOwnerInfo cargoOwnerInfo);
 
+    /**
+     * 货主后台管理
+     * @param cargoOwnerInfo
+     * @return
+     */
     Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo);
 
+    /**
+     * 审核
+     * @param cargoOwnerInfo
+     * @return
+     */
     String examine(CargoOwnerInfo cargoOwnerInfo);
 }

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

@@ -95,6 +95,11 @@ public interface IPublishTaskInfoService extends IService<PublishTaskInfo> {
      */
     String addOrder(PublishTaskInfo publishTaskInfo);
 
+    /**
+     * 审核
+     * @param publishTaskInfo
+     * @return
+     */
     String examine(PublishTaskInfo publishTaskInfo);
 
 }

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

@@ -1,6 +1,8 @@
 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.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
@@ -17,6 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 货主企业信息 服务实现类
@@ -45,8 +51,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
     public String addCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo){
         //新增主键id
         cargoOwnerCompInfo.setId(IdGenerator.generateUUID());
-        cargoOwnerCompInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-        cargoOwnerCompInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+        cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
         this.insert(cargoOwnerCompInfo);
         //根据公司名称和法人名称获取公司用户id
         CompanyInfo companyInfo = companyInfoService.selectOne(new EntityWrapper<CompanyInfo>()
@@ -80,8 +86,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         CargoOwnerCompInfo cargoOwnerCompInfo1 = this.selectById(cargoOwnerCompInfo.getId());
         if (cargoOwnerCompInfo1 != null){
             //信息编辑
-            cargoOwnerCompInfo1.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            cargoOwnerCompInfo1.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+            cargoOwnerCompInfo1.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
             this.updateById(cargoOwnerCompInfo1);
         }
         return "OK";
@@ -101,6 +107,33 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         }
     }
 
+    /**
+     * 授权审核后台管理页面
+     *
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    @Override
+    public Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (cargoOwnerCompInfo.getCurrentPage() - 1)
+                * cargoOwnerCompInfo.getPageSize());
+        //公司id
+        pageView.put("searchType", cargoOwnerCompInfo.getSearchType());
+        pageView.put("searchKeyWord", cargoOwnerCompInfo.getSearchKeyWord());
+        pageView.put("pageSize", cargoOwnerCompInfo.getPageSize());
+        pageView.put("currentPage", cargoOwnerCompInfo.getCurrentPage());
+        // 查询货主总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<CargoOwnerCompInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<CargoOwnerCompInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(cargoOwnerCompInfo.getCurrentPage());
+        page.setSize(cargoOwnerCompInfo.getPageSize());
+        return page;
+    }
+
 
     /**
      * 审核/ 禁用
@@ -117,8 +150,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         if (cargoOwnerCompInfo1 != null) {
             //通过
             if ("1".equals(cargoOwnerCompInfo.getFlag())) {
-                cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                cargoOwnerCompInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                cargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_CERTIFIED.getFlag());
+                cargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_CERTIFIED.getName());
 //                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());
@@ -134,8 +167,9 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
             }
 //            驳回
             else if("2".equals(cargoOwnerCompInfo.getFlag())){
-                cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                cargoOwnerCompInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                cargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_REJECTED.getFlag());
+                cargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_REJECTED.getName());
+                this.updateById(cargoOwnerCompInfo);
 //                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/CompanyInfoServiceImpl.java

@@ -78,14 +78,15 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editCompanyInfo(CompanyInfo companyInfo) {
-        CompanyInfo companyInfo1 = this.selectById(companyInfo.getId());
-        if (companyInfo1 != null){
             //信息编辑
-            companyInfo1.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            companyInfo1.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-            this.updateById(companyInfo1);
+            companyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            companyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            boolean one = this.updateById(companyInfo);
+        if(one){
+            return "OK";
+        }{
+            return "NG";
         }
-        return "OK";
     }
 
     /**

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

@@ -598,7 +598,6 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 //                messageDO.setPath("XXXXX");
 //                webSocket.sendOneMessage(messageDO);
             }
-
             //更改信息
             this.updateById(publishTaskInfo1);
             return "OK";

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

@@ -2,4 +2,72 @@
 <!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.CargoOwnerCompInfoMapper">
 
+    <!-- 获得所属公司总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        select
+        count(c.id)
+        FROM cargo_owner_comp_info c
+        LEFT JOIN cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '5'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '7'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '9'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(co.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(co.phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+
+
+
+    <!-- 所属公司列表查询 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo">
+        SELECT
+        c.id,
+        co.name as name,
+        co.phone as phone,
+        co.card_number as cardNumber,
+        c.company as company,
+        c.certificate_address_url as certificateAddressUrl,
+        c.authorization_deadline as authorizationDeadline,
+        c.status_key as statusKey,
+        c.status as status,
+        c.create_date as createDate,
+        c.update_date as updateDate,
+        cu.avatar_url as avatarUrl
+        FROM cargo_owner_comp_info c
+        LEFT JOIN cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
+        LEFT JOIN common_user cu on cu.id = co.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '5'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '7'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '9'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(co.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(co.phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY c.update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

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

@@ -2,8 +2,6 @@
 <!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.CargoOwnerInfoMapper">
 
-
-
     <!-- 获得货主总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select

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

@@ -4,72 +4,112 @@
     <!-- 获得任务总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
-        COUNT(id)
-        FROM publish_task_info
-        WHERE delete_flag = '0'
-        AND common_id = #{commonId}
+        COUNT(p.id)
+        FROM publish_task_info p
+        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        WHERE p.delete_flag = '0'
+        <if test="commonId != null and commonId != ''">
+            AND p.common_id = #{commonId}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(p.task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND p.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND p.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND p.status_key = '5'
+            </if>
         </if>
     </select>
     <!-- 获得任务列表 -->
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo">
         SELECT
-        id,
-        task_no as taskNo,
-        cargo_owner as cargoOwner,
-        goods_name as goodsName,
-        send_private as sendPrivate,
-        send_city as sendCity,
-        send_area as sendArea,
-        send_detailed_address as sendDetailedAddress,
-        send_longitude as sendLongitude,
-        send_latitude as sendLatitude,
-        unsend_longitude as unsendLongitude,
-        unsend_latitude as unsendLatitude,
-        unload_private as unloadPrivate,
-        unload_city as unloadCity,
-        unload_area as unloadArea,
-        unload_detailed_address as unloadDetailedAddress,
-        distance,
-        billing_method as billingMethod,
-        freight_price as freightPrice,
-        freight_advance as freightAdvance,
-        sender,
-        sender_phone as senderPhone,
-        receiver,
-        receiver_phone as receiverPhone,
-        weight,
-        loading_date_start as loadingDateStart,
-        loading_date_end as loadingDateEnd,
-        car_length_small as carLengthSmall,
-        car_length as carLength,
-        load_weight_small as loadWeightSmall,
-        load_weight as loadWeight,
-        task_description as taskDescription,
-        task_validity as taskValidity,
-        car_model as carModel,
-        show_hide as showHide,
-        refresh_times as refreshTimes,
-        status,
-        create_date as createDate,
-        update_date as updateDate
-        FROM publish_task_info
-        WHERE delete_flag = '0'
-        AND common_id = #{commonId}
+        p.id,
+        p.task_no as taskNo,
+        p.cargo_owner as cargoOwner,
+        p.goods_name as goodsName,
+        p.send_private as sendPrivate,
+        p.send_city as sendCity,
+        p.send_area as sendArea,
+        p.send_detailed_address as sendDetailedAddress,
+        p.send_longitude as sendLongitude,
+        p.send_latitude as sendLatitude,
+        p.unsend_longitude as unsendLongitude,
+        p.unsend_latitude as unsendLatitude,
+        p.unload_private as unloadPrivate,
+        p.unload_city as unloadCity,
+        p.unload_area as unloadArea,
+        p.unload_detailed_address as unloadDetailedAddress,
+        p.distance,
+        p.billing_method as billingMethod,
+        p.freight_price as freightPrice,
+        p.freight_advance as freightAdvance,
+        p.sender,
+        p.sender_phone as senderPhone,
+        p.receiver,
+        p.receiver_phone as receiverPhone,
+        p.weight,
+        p.loading_date_start as loadingDateStart,
+        p.loading_date_end as loadingDateEnd,
+        p.car_length_small as carLengthSmall,
+        p.car_length as carLength,
+        p.load_weight_small as loadWeightSmall,
+        p.load_weight as loadWeight,
+        p.task_description as taskDescription,
+        p.task_validity as taskValidity,
+        p.car_model as carModel,
+        p.show_hide as showHide,
+        p.refresh_times as refreshTimes,
+        p.status,
+        p.create_date as createDate,
+        p.update_date as updateDate,
+        c.name as cargoOwnerName,
+        c.phone as cargoOwnerPhone,
+        cu.avatar_url as cargoOwnerPortrait
+        FROM publish_task_info p
+        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
+        WHERE p.delete_flag = '0'
+        <if test="commonId != null and commonId != ''">
+            AND p.common_id = #{commonId}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%')))
-        </if>
-        ORDER BY create_date DESC
+            AND (lower(p.task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND p.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND p.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND p.status_key = '5'
+            </if>
+        </if>
+        ORDER BY p.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>