gongdecai 3 lat temu
rodzic
commit
b8d78d2b20
15 zmienionych plików z 395 dodań i 4 usunięć
  1. 12 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerCompInfoController.java
  2. 24 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerInfoController.java
  3. 12 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PublishTaskInfoController.java
  4. 6 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerCompInfo.java
  5. 15 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerInfo.java
  6. 5 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PublishTaskInfo.java
  7. 20 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CargoOwnerInfoMapper.java
  8. 2 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerCompInfoService.java
  9. 5 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerInfoService.java
  10. 2 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IPublishTaskInfoService.java
  11. 56 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerCompInfoServiceImpl.java
  12. 102 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java
  13. 58 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java
  14. 75 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CargoOwnerInfoMapper.xml
  15. 1 1
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverInfoMapper.xml

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 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;
@@ -49,5 +50,16 @@ public class CargoOwnerCompInfoController {
     public void deleteCargoOwnerComp(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
         cargoOwnerCompInfoService.deleteCargoOwnerComp(cargoOwnerCompInfo.getId());
     }
+
+
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
+        return cargoOwnerCompInfoService.examine(cargoOwnerCompInfo);
+    }
 }
 

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

@@ -1,7 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,17 @@ public class CargoOwnerInfoController {
     @Autowired
     private ICargoOwnerInfoService cargoOwnerInfoService;
 
+
+    /**
+     * huozhu 管理页面列表
+     * @param cargoOwnerInfo
+     * @return
+     */
+    @GetMapping("/selectCargoOwnerInfoPage")
+    public Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo){
+        return cargoOwnerInfoService.selectCargoOwnerInfoPage(cargoOwnerInfo);
+    }
+
     /**
      * 货主认证列表
      * @return
@@ -47,5 +60,16 @@ public class CargoOwnerInfoController {
         return cargoOwnerInfoService.editCargoOwner(cargoOwnerInfo);
     }
 
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(@RequestBody CargoOwnerInfo cargoOwnerInfo){
+        return cargoOwnerInfoService.examine(cargoOwnerInfo);
+    }
+
+
 }
 

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 import com.yh.saas.plugin.yiliangyiyun.service.IPublishTaskInfoService;
@@ -114,5 +115,16 @@ public class PublishTaskInfoController {
     public String addOrder(@RequestBody PublishTaskInfo publishTaskInfo){
         return publishTaskInfoService.addOrder(publishTaskInfo);
     }
+
+
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(@RequestBody PublishTaskInfo publishTaskInfo){
+        return publishTaskInfoService.examine(publishTaskInfo);
+    }
 }
 

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

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -71,7 +72,11 @@ public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
      * 认证状态
      */
     private String status;
-
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
 
     @Override
     protected Serializable pkVal() {

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

@@ -79,7 +79,21 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
 
     @TableField(exist = false)
     private CargoOwnerCompInfo cargoOwnerCompInfo;
-
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
 
     @Override
     protected Serializable pkVal() {

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

@@ -279,7 +279,11 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
     @TableField(exist = false)
     private String cargoOwnerPortrait;
 
-
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
     @Override
     protected Serializable pkVal() {
         return this.id;

+ 20 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CargoOwnerInfoMapper.java

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

+ 2 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerCompInfoService.java

@@ -32,4 +32,6 @@ public interface ICargoOwnerCompInfoService extends IService<CargoOwnerCompInfo>
      * @param id
      */
     void deleteCargoOwnerComp(String id);
+
+    String examine(CargoOwnerCompInfo cargoOwnerCompInfo);
 }

+ 5 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerInfoService.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.CargoOwnerInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -35,4 +36,8 @@ public interface ICargoOwnerInfoService extends IService<CargoOwnerInfo> {
      * @return
      */
     String editCargoOwner(CargoOwnerInfo cargoOwnerInfo);
+
+    Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo);
+
+    String examine(CargoOwnerInfo cargoOwnerInfo);
 }

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

@@ -81,4 +81,6 @@ public interface IPublishTaskInfoService extends IService<PublishTaskInfo> {
      */
     String addOrder(PublishTaskInfo publishTaskInfo);
 
+    String examine(PublishTaskInfo publishTaskInfo);
+
 }

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

@@ -100,4 +100,60 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
             this.deleteById(cargoOwnerCompInfo.getId());
         }
     }
+
+
+    /**
+     * 审核/ 禁用
+     *
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(CargoOwnerCompInfo cargoOwnerCompInfo) {
+        //查询列表
+        CargoOwnerCompInfo cargoOwnerCompInfo1 = this.selectById(cargoOwnerCompInfo.getId());
+
+        if (cargoOwnerCompInfo1 != null) {
+            //通过
+            if ("1".equals(cargoOwnerCompInfo.getFlag())) {
+                cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                cargoOwnerCompInfo1.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(cargoOwnerCompInfo.getFlag())){
+                cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                cargoOwnerCompInfo1.setStatus(StatusEnum.IDENTITY_FAILED.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);
+            }
+
+            //更改信息
+            this.updateById(cargoOwnerCompInfo1);
+            return "OK";
+        }
+        return "NG";
+    }
 }

+ 102 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.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.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -18,7 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -34,6 +38,38 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
     @Autowired
     private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
 
+
+
+    /**
+     * 货主后台管理页面
+     *
+     * @param cargoOwnerInfo
+     * @return
+     */
+    @Override
+    public Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (cargoOwnerInfo.getCurrentPage() - 1)
+                * cargoOwnerInfo.getPageSize());
+        //公司id
+//        pageView.put("compId", cargoOwnerInfo.getCompId());
+        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<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(cargoOwnerInfo.getCurrentPage());
+        page.setSize(cargoOwnerInfo.getPageSize());
+        return page;
+    }
+
+
     /**
      *货主认证列表
      * @param commonId
@@ -90,4 +126,70 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
         }
         return "OK";
     }
+
+
+
+    /**
+     * 审核/ 禁用
+     *
+     * @param cargoOwnerInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(CargoOwnerInfo cargoOwnerInfo) {
+        //查询列表
+        CargoOwnerInfo cargoOwnerInfo1 = this.selectById(cargoOwnerInfo.getId());
+
+        if (cargoOwnerInfo1 != null) {
+            //通过
+            if ("1".equals(cargoOwnerInfo.getFlag())) {
+                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                cargoOwnerInfo1.setAuthenticationStatus(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(cargoOwnerInfo.getFlag())){
+                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.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("3".equals(cargoOwnerInfo.getFlag())){
+                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+            }
+            else if("4".equals(cargoOwnerInfo.getFlag())){
+                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            }
+            //更改信息
+            this.updateById(cargoOwnerInfo1);
+            return "OK";
+        }
+        return "NG";
+    }
+
 }

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

@@ -414,4 +414,62 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             return "NG";
         }
     }
+
+
+
+
+    /**
+     * 审核
+     *
+     * @param publishTaskInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(PublishTaskInfo publishTaskInfo){
+        //查询列表
+        PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
+
+        if (publishTaskInfo1 != null) {
+            //通过
+            if ("1".equals(publishTaskInfo.getFlag())) {
+                publishTaskInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                publishTaskInfo1.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(publishTaskInfo.getFlag())){
+                publishTaskInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                publishTaskInfo1.setStatus(StatusEnum.IDENTITY_FAILED.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);
+            }
+
+            //更改信息
+            this.updateById(publishTaskInfo1);
+            return "OK";
+        }
+        return "NG";
+    }
 }

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

@@ -2,4 +2,79 @@
 <!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
+        count(1)
+        FROM cargo_owner_info
+        WHERE
+        delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND authentication_status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND authentication_status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND authentication_status_key = '5'
+            </if>
+            <if test="searchType == 4">
+                AND 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},'%')))
+        </if>
+    </select>
+
+
+
+    <!-- 货主列表查询 -->
+    <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'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND authentication_status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND authentication_status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND authentication_status_key = '5'
+            </if>
+            <if test="searchType == 4">
+                AND 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},'%')))
+        </if>
+        ORDER BY d.update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
+
 </mapper>

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

@@ -54,7 +54,7 @@
     --         payee_address_url as payeeAddressUrl,
     --         card_address_url as cardAddressUrl1,
         update_date as updateDate
-        FROM driver_view_info
+        FROM driver_info
         WHERE
         delete_flag = '0'
         <if test="searchType != null and searchType != ''">