司机审核

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizDriverController.java

@@ -5,6 +5,7 @@ import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
 import com.njzscloud.supervisory.biz.pojo.param.AddDriverParam;
+import com.njzscloud.supervisory.biz.pojo.param.AuditDriverParam;
 import com.njzscloud.supervisory.biz.service.BizDriverService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -87,4 +88,15 @@ public class BizDriverController {
         return R.success(bizDriverService.dispensabilityList(pageParam, keywords));
     }
 
+    /**
+     * 审核司机
+     *
+     * @param auditDriverParam 审核参数
+     */
+    @PostMapping("/audit")
+    public R<?> audit(@RequestBody AuditDriverParam auditDriverParam) {
+        bizDriverService.audit(auditDriverParam);
+        return R.success();
+    }
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizDriverMapper.java

@@ -1,6 +1,9 @@
 package com.njzscloud.supervisory.biz.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,4 +18,12 @@ public interface BizDriverMapper extends BaseMapper<BizDriverEntity> {
     @Select("SELECT id,uscc FROM biz_company WHERE user_id = #{userId}")
     SearchCompanyResult selectCompanyByUserId(@Param("userId") Long userId);
 
+    /**
+     * 分页查询司机信息，包含清运公司名称
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 分页结果
+     */
+    IPage<BizDriverEntity> selectPageWithCompanyName(Page<BizDriverEntity> page, @Param("ew") Wrapper<BizDriverEntity> queryWrapper);
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizDriverEntity.java

@@ -1,6 +1,7 @@
 package com.njzscloud.supervisory.biz.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.njzscloud.supervisory.biz.contant.AuditStatus;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -35,6 +36,12 @@ public class BizDriverEntity {
      */
     private Long companyId;
 
+    /**
+     * 清运公司名称; biz_company.company_name (联表查询字段，不映射到数据库)
+     */
+    @TableField(exist = false)
+    private String companyName;
+
     /**
      * 司机名称
      */
@@ -78,6 +85,16 @@ public class BizDriverEntity {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime modifyTime;
 
+    /**
+     * 审核状态; 字典代码: audit_status
+     */
+    private AuditStatus auditStatus;
+
+    /**
+     * 审核备注
+     */
+    private String auditMemo;
+
     /**
      * 是否删除; 0-->未删除、1-->已删除
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/AuditDriverParam.java

@@ -0,0 +1,28 @@
+package com.njzscloud.supervisory.biz.pojo.param;
+
+import com.njzscloud.supervisory.biz.contant.AuditStatus;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class AuditDriverParam {
+    /**
+     * 司机 Id
+     */
+    private Long id;
+
+    /**
+     * 审核状态; 字典代码：audit_status
+     */
+    private AuditStatus auditStatus;
+
+    /**
+     * 审核备注
+     */
+    private String auditMemo;
+}

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java

@@ -2,17 +2,22 @@ package com.njzscloud.supervisory.biz.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.common.security.support.UserDetail;
 import com.njzscloud.common.security.util.SecurityUtil;
+import com.njzscloud.supervisory.biz.contant.AuditStatus;
 import com.njzscloud.supervisory.biz.contant.BizObj;
 import com.njzscloud.supervisory.biz.mapper.BizDriverMapper;
 import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
 import com.njzscloud.supervisory.biz.pojo.param.AddDriverParam;
+import com.njzscloud.supervisory.biz.pojo.param.AuditDriverParam;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
 import com.njzscloud.supervisory.sys.user.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -28,7 +33,7 @@ import java.util.List;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEntity> implements IService<BizDriverEntity> {
+public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEntity> {
     private final UserService sysUserService;
 
     /**
@@ -88,8 +93,13 @@ public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEnti
      */
     public PageResult<BizDriverEntity> paging(PageParam pageParam, BizDriverEntity bizDriverEntity) {
         String driverName = bizDriverEntity.getDriverName();
-        return PageResult.of(this.page(pageParam.toPage(), Wrappers.<BizDriverEntity>lambdaQuery()
-                .like(StrUtil.isNotBlank(driverName), BizDriverEntity::getDriverName, driverName)));
+        String phone = bizDriverEntity.getPhone();
+        Wrapper<BizDriverEntity> queryWrapper = Wrappers.<BizDriverEntity>query()
+                .like(StrUtil.isNotBlank(driverName), "d.driver_name", driverName)
+                .like(StrUtil.isNotBlank(phone), "d.phone", phone);
+        
+        Page<BizDriverEntity> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        return PageResult.of(baseMapper.selectPageWithCompanyName(page, queryWrapper));
     }
 
     public PageResult<BizDriverEntity> dispensabilityList(PageParam pageParam, String keywords) {
@@ -104,4 +114,34 @@ public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEnti
                                 .or().like(BizDriverEntity::getPhone, keywords))
         ));
     }
+
+    /**
+     * 审核司机
+     *
+     * @param auditDriverParam 审核参数
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void audit(AuditDriverParam auditDriverParam) {
+        Assert.isTrue(auditDriverParam.getAuditStatus() == AuditStatus.TongGuo || 
+                     auditDriverParam.getAuditStatus() == AuditStatus.BoHui, "错误的审核状态");
+        
+        BizDriverEntity oldData = getById(auditDriverParam.getId());
+        if (oldData == null) {
+            throw Exceptions.exception("未找到要审核的司机信息");
+        }
+        
+        if (oldData.getAuditStatus() != AuditStatus.DaiShenHe) {
+            throw Exceptions.exception("当前状态不能审核");
+        }
+        
+        boolean updated = update(Wrappers.<BizDriverEntity>lambdaUpdate()
+                .set(BizDriverEntity::getAuditStatus, auditDriverParam.getAuditStatus())
+                .set(BizDriverEntity::getAuditMemo, auditDriverParam.getAuditMemo())
+                .eq(BizDriverEntity::getId, auditDriverParam.getId())
+                .eq(BizDriverEntity::getAuditStatus, AuditStatus.DaiShenHe));
+        
+        if (!updated) {
+            throw Exceptions.exception("数据状态已改变，无法审核");
+        }
+    }
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/mapper/MoneyChangeDetailMapper.java

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface MoneyChangeDetailMapper extends BaseMapper<MoneyChangeDetailEntity> {
     /**
-     * 分页查询资金账户（关联用户或企业信息）
+     * 分页查询
      */
     IPage<MoneyChangeDetailEntity> page(Page<MoneyChangeDetailEntity> page, @Param("entity") MoneyChangeDetailEntity entity);
 

njzscloud-svr/src/main/resources/mapper/biz/BizDriverMapper.xml

@@ -0,0 +1,34 @@
+<?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.njzscloud.supervisory.biz.mapper.BizDriverMapper">
+
+    <!-- 分页查询司机信息，包含清运公司名称 -->
+    <select id="selectPageWithCompanyName" resultType="com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity">
+        SELECT 
+            d.id,
+            d.user_id,
+            d.company_id,
+            d.driver_name,
+            d.phone,
+            d.driving_licence,
+            d.licence_start_time,
+            d.licence_end_time,
+            d.audit_status,
+            d.audit_memo,
+            d.creator_id,
+            d.modifier_id,
+            d.create_time,
+            d.modify_time,
+            d.deleted,
+            c.company_name
+        FROM biz_driver d
+        LEFT JOIN biz_company c ON d.company_id = c.id AND c.deleted = 0
+        WHERE d.deleted = 0
+        <if test="ew != null">
+            <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </if>
+    </select>
+
+</mapper>