运单审核

performance-api/src/main/java/com/clx/performance/param/pc/PagePoundAuditParam.java

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author liruixin
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PagePoundAuditParam extends PageParam {
+
+    @ApiModelProperty(value="运单编号",example = "201457878")
+    private String childNo;
+
+    @ApiModelProperty(value="司机姓名",example = "募资类")
+    private String driverName;
+
+    @ApiModelProperty(value="司机手机号",example = "12222222222")
+    private String driverMobile;
+
+    @ApiModelProperty(value="发货地址",example = "北京")
+    private String sendAddress;
+
+    @ApiModelProperty(value="收货地址",example = "黄羊城")
+    private String receiveAddress;
+
+    @ApiModelProperty(value="审核状态 0-待审核，1-审核失败， 2-审核成功",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="开始时间",example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间",example = "2020-01-01 10:10:10")
+    private String endTime;
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildPoundAuditVO.java

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 运单表
+* @Date: 2023/09/18 11:34:50
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildPoundAuditVO  {
+
+    @ApiModelProperty(value="运单编号",example = "41441")
+    private String childNo;
+
+    @ApiModelProperty(value="货物名称",example = "煤炭")
+    private String goodsName;
+
+    @ApiModelProperty(value="发货地址",example = "吉林")
+    private String sendAddress;
+
+    @ApiModelProperty(value="收货地址",example = "山西")
+    private String receiveAddress;
+
+    @ApiModelProperty(value="司机姓名",example = "张安")
+    private String driverName;
+
+    @ApiModelProperty(value="司机手机号",example = "12222222222")
+    private String driverMobile;
+
+    @ApiModelProperty(value="装货净重",example = "10")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value="卸货净重",example = "41")
+    private BigDecimal unloadNet;
+
+    @ApiModelProperty(value="审核状态 0-待审核，1-审核失败， 2-审核成功",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="接单时间",example = "2020-01-01 10:10:10")
+    private String payTime;
+
+    @ApiModelProperty(value="装车时间",example = "2020-01-01 10:10:10")
+    private String loadTime;
+
+    @ApiModelProperty(value="卸车时间",example = "2020-01-01 10:10:10")
+    private String unloadTime;
+
+
+
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/pc/OrderChildPoundAuditController.java

+package com.clx.performance.controller.pc;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.service.OrderChildService;
+import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import com.msl.common.base.PageData;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/poundaudit")
+@Validated
+@Api(tags = "承运端-运单")
+@AllArgsConstructor
+public class OrderChildPoundAuditController {
+
+    private final OrderChildService orderChildService;
+
+    @ApiOperation(value = "磅单审核列表",notes = "<br>By:李瑞新")
+    @PostMapping("/pagePoundAuditList")
+    public Result<PageData<OrderChildPoundAuditVO>> pagePoundAuditList(@RequestBody PagePoundAuditParam param) {
+        IPage<OrderChildPoundAuditVO> page = orderChildService.pagePoundAuditList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

 package com.clx.performance.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
@@ -26,5 +29,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     long countOfCancel(Long userNo, LocalDateTime startTime, LocalDateTime endTime);
 
+    IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
+
 
 }

performance-web/src/main/java/com/clx/performance/dao/OrderChildPoundAuditDao.java

+package com.clx.performance.dao;
+
+
+import com.clx.performance.mapper.OrderChildPoundAuditMapper;
+import com.clx.performance.model.OrderChildPoundAudit;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+public interface OrderChildPoundAuditDao extends BaseDao<OrderChildPoundAuditMapper, OrderChildPoundAudit, Integer> {
+}

performance-web/src/main/java/com/clx/performance/dao/OrderChildPoundLogDao.java

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.OrderChildPoundLogMapper;
+import com.clx.performance.model.OrderChildPoundLog;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+public interface OrderChildPoundLogDao extends BaseDao<OrderChildPoundLogMapper, OrderChildPoundLog, Integer> {
+}

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

 package com.clx.performance.dao.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
@@ -65,4 +69,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .le(OrderChild::getCreateTime, endTime)
         );
     }
+
+    @Override
+    public IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
+        Page<OrderChildPoundAuditVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pagePoundAuditList(page,param);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildPoundAuditDaoImpl.java

+package com.clx.performance.dao.impl;
+
+
+import com.clx.performance.dao.OrderChildPoundAuditDao;
+import com.clx.performance.mapper.OrderChildPoundAuditMapper;
+import com.clx.performance.model.OrderChildPoundAudit;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+@Repository
+public class OrderChildPoundAuditDaoImpl extends BaseDaoImpl<OrderChildPoundAuditMapper, OrderChildPoundAudit, Integer> implements OrderChildPoundAuditDao {
+}

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildPoundLogDaoImpl.java

+package com.clx.performance.dao.impl;
+
+
+import com.clx.performance.dao.OrderChildPoundLogDao;
+import com.clx.performance.mapper.OrderChildPoundLogMapper;
+import com.clx.performance.model.OrderChildPoundLog;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+@Repository
+public class OrderChildPoundLogDaoImpl extends BaseDaoImpl<OrderChildPoundLogMapper, OrderChildPoundLog, Integer> implements OrderChildPoundLogDao {
+}

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

 package com.clx.performance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.sqlProvider.OrderChildSqlProvider;
+import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
 
-/**
-* @Author: aiqinguo
-* @Description: 运单表
-* @Date: 2023/09/18 11:34:50
-* @Version: 1.0
-*/
 
 @Mapper
 public interface OrderChildMapper extends BaseMapper<OrderChild> {
 
+    @SelectProvider(type = OrderChildSqlProvider.class, method = "pagePoundAuditList")
+    IPage<OrderChildPoundAuditVO> pagePoundAuditList(@Param("page") Page<OrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param);
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/OrderChildPoundAuditMapper.java

+package com.clx.performance.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.OrderChildPoundAudit;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+public interface OrderChildPoundAuditMapper extends BaseMapper<OrderChildPoundAudit> {
+}

performance-web/src/main/java/com/clx/performance/mapper/OrderChildPoundLogMapper.java

+package com.clx.performance.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.OrderChildPoundLog;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+public interface OrderChildPoundLogMapper extends BaseMapper<OrderChildPoundLog> {
+}

performance-web/src/main/java/com/clx/performance/model/OrderChildPoundAudit.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("order_child_pound_audit")
+public class OrderChildPoundAudit implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("child_no")
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @TableField("status")
+    @ApiModelProperty("审核状态")
+    private Integer status;
+
+    @TableField("reject_type")
+    @ApiModelProperty("审核驳回类型：1装车 2卸车 3装车+卸车")
+    private Integer rejectType;
+
+    @TableField("remark")
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

performance-web/src/main/java/com/clx/performance/model/OrderChildPoundLog.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("order_child_pound_log")
+public class OrderChildPoundLog  implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("child_no")
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @TableField("status")
+    @ApiModelProperty("审核状态")
+    private Integer status;
+
+    @TableField("remark")
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @TableField("create_type")
+    @ApiModelProperty("操作人类型1-货主， 2-承运端，3-司机")
+    private Integer createType;
+
+    @TableField("create_by")
+    @ApiModelProperty("操作人编号")
+    private Long createBy;
+
+    @TableField("create_name")
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

performance-web/src/main/java/com/clx/performance/service/OrderChildPoundAuditService.java

+package com.clx.performance.service;
+
+
+
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+public interface OrderChildPoundAuditService  {
+}

performance-web/src/main/java/com/clx/performance/service/OrderChildPoundLogService.java

+package com.clx.performance.service;
+
+
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+public interface OrderChildPoundLogService {
+}

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

 package com.clx.performance.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.*;
+import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 
 
 /**
@@ -27,4 +30,6 @@ public interface OrderChildService {
 
     void updateCancel(OrderChildCancelParam param);
 
+    IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
+
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

+package com.clx.performance.service.impl;
+
+
+
+import com.clx.performance.service.OrderChildPoundAuditService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+@Service
+public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditService {
+}

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundLogServiceImpl.java

+package com.clx.performance.service.impl;
+
+
+
+import com.clx.performance.service.OrderChildPoundLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author liruixin
+ * Date 2023-09-19
+ * Time 13:25
+ */
+@Service
+public class OrderChildPoundLogServiceImpl  implements OrderChildPoundLogService {
+}

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

 package com.clx.performance.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -9,8 +10,10 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.*;
+import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildService;
+import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
@@ -470,4 +473,9 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         return orderChild.getLoadNet();
     }
+
+    @Override
+    public IPage<OrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
+        return orderChildDao.pagePoundAuditList(param);
+    }
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

+package com.clx.performance.sqlProvider;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.vo.pc.OrderChildPoundAuditVO;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+import java.util.Objects;
+
+public class OrderChildSqlProvider {
+
+    public String pagePoundAuditList(@Param("page") Page<OrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param) {
+        return new SQL(){{
+            SELECT("child_no,goods_name,send_address,receive_address,driver_name,driver_mobile,load_net,unload_net," +
+                    "pound_status,date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
+                    "date_format(load_time, '%Y-%m-%d %H:%i:%s') as loadTime," +
+                    "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime ");
+            FROM("order_child ");
+            WHERE("pound_status >0");
+            if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("pay_time >= #{param.beginTime}");}
+            if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("pay_time <= #{param.endTime}");}
+
+            if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
+            if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name= #{param.driverName}");}
+            if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
+
+            if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address = #{param.sendAddress}");}
+            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address= #{param.receiveAddress}");}
+            if (Objects.nonNull(param.getStatus())) {WHERE("pound_status = #{param.status}");}
+
+            ORDER_BY("unload_time,pound_status");
+        }}.toString();
+    }
+
+
+}