运单列表

performance-api/src/main/java/com/clx/performance/param/app/PageOrderChildOfDriverParam.java

@@ -13,17 +13,11 @@ import lombok.ToString;
 @ToString
 public class PageOrderChildOfDriverParam extends PageParam {
 
-    @ApiModelProperty(value = "搜索内容", example = "北京")
-    private String content;
-
-    @ApiModelProperty(value="状态",example = "1")
+    @ApiModelProperty(value="状态 0全部 1运输中 2已完成 3已结算 4已取消",example = "1")
     private Integer status;
-
-    @ApiModelProperty(value="开始时间")
-    private String beginTime;
-
-    @ApiModelProperty(value = "结束时间")
-    private String endTime;
+    public Integer getStatus() {
+        return status!=null && status==0? null : status;
+    }
 
     @ApiModelProperty(value = "用户编号", hidden = true)
     private Long userNo;

performance-api/src/main/java/com/clx/performance/param/app/PageOrderChildOfDriverSearchParam.java

+package com.clx.performance.param.app;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageOrderChildOfDriverSearchParam extends PageParam {
+
+    @ApiModelProperty(value = "搜索内容", example = "北京")
+    private String content;
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -82,6 +82,9 @@ public class OrderChildVO {
     private BigDecimal unloadTare;
     @ApiModelProperty(value = "卸货净重（单位吨）", example = "")
     private BigDecimal unloadNet;
+    @ApiModelProperty(value = "卸货磅单编号", example = "")
+    private String unloadPoundNo;
+
     @ApiModelProperty(value = "拉运重量（单位吨）", example = "")
     private BigDecimal weight;
 

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverOrderChildController.java

@@ -120,9 +120,16 @@ public class AppDriverOrderChildController {
 
     @ApiOperation(value = "分页查询运单列表",notes = "<br>By:艾庆国")
     @PostMapping("/pageOrderChild")
-    public Result<PageData<OrderChildVO>> pageOrderChild(@RequestBody PageOrderChildOfDriverParam param) {
+    public Result<PageData<OrderChildVO>> pageOrderChild(@RequestBody @Validated PageOrderChildOfDriverParam param) {
         IPage<OrderChildVO> page = orderChildService.pageOrderChild(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+    @ApiOperation(value = "分页搜索运单列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageSearchOrderChild")
+    public Result<PageData<OrderChildVO>> pageSearchOrderChild(@RequestBody @Validated PageOrderChildOfDriverSearchParam param) {
+        IPage<OrderChildVO> page = orderChildService.pageSearchOrderChild(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
+import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
@@ -32,6 +33,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     long countOfCancel(Long userNo, LocalDateTime startTime, LocalDateTime endTime);
 
     IPage<OrderChildVO> pageOrderChildOfDriver(PageOrderChildOfDriverParam param);
+    IPage<OrderChildVO> pageSearchOrderChildOfDriver(PageOrderChildOfDriverSearchParam param);
 
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
 

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

@@ -7,6 +7,7 @@ import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
+import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
@@ -115,6 +116,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.pageOrderChildOfDriver(page,param);
     }
 
+    @Override
+    public IPage<OrderChildVO> pageSearchOrderChildOfDriver(PageOrderChildOfDriverSearchParam param) {
+        Page<OrderChildVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageSearchOrderChildOfDriver(page,param);
+    }
+
     @Override
     public IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param) {
         Page<PageOrderChildPoundAuditVO> page = Page.of(param.getPage(), param.getPageSize());

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

@@ -5,6 +5,7 @@ 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.app.PageOrderChildOfDriverParam;
+import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.sqlProvider.OrderChildSqlProvider;
 import com.clx.performance.vo.app.OrderChildVO;
@@ -25,6 +26,13 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     @SelectProvider(type = OrderChildSqlProvider.class, method = "pageOrderChildOfDriver")
     IPage<OrderChildVO> pageOrderChildOfDriver(@Param("page") Page<OrderChildVO> page, @Param("param") PageOrderChildOfDriverParam param);
 
+    /**
+     * 搜索司机运单列表
+     * @see OrderChildSqlProvider#pageSearchOrderChildOfDriver(Page, PageOrderChildOfDriverSearchParam)
+     */
+    @SelectProvider(type = OrderChildSqlProvider.class, method = "pageSearchOrderChildOfDriver")
+    IPage<OrderChildVO> pageSearchOrderChildOfDriver(@Param("page") Page<OrderChildVO> page, @Param("param") PageOrderChildOfDriverSearchParam param);
+
 
     @SelectProvider(type = OrderChildSqlProvider.class, method = "pagePoundAuditList")
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(@Param("page") Page<PageOrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param);

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

@@ -57,6 +57,7 @@ public class OrderChild implements HasKey<Integer> {
     private BigDecimal unloadRough;                 //卸货毛重（单位吨）
     private BigDecimal unloadTare;                  //卸货皮重（单位吨）
     private BigDecimal unloadNet;                   //卸货净重（单位吨）
+    private String unloadPoundNo;                   //卸货磅单编号
 
     private BigDecimal weight;                      //拉运重量（单位吨）
     private BigDecimal freight;                     //运费（分）

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

@@ -34,6 +34,7 @@ public interface OrderChildService {
     OrderChildVO getOrderChildInfo(String childNo);
 
     IPage<OrderChildVO> pageOrderChild(PageOrderChildOfDriverParam param);
+    IPage<OrderChildVO> pageSearchOrderChild(PageOrderChildOfDriverSearchParam param);
 
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
 

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

@@ -630,6 +630,15 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     }
 
+    @Override
+    public IPage<OrderChildVO> pageSearchOrderChild(PageOrderChildOfDriverSearchParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        param.setUserNo(userNo);
+        return orderChildDao.pageSearchOrderChildOfDriver(param);
+    }
+
 
     /**
      * 更新货单数据

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

@@ -3,6 +3,7 @@ package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
+import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
@@ -20,7 +21,27 @@ public class OrderChildSqlProvider {
                     "send_address,receive_address," +
                     "driver_user_no, driver_name,driver_mobile," +
                     "truck_no," +
-                    "weight," +
+                    "unload_pound_no,weight," +
+                    "cancel_remark," +
+                    "pound_status,status," +
+                    "date_format(load_deadline, '%Y-%m-%d %H:%i:%s') as loadDeadline," +
+                    "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime "
+            );
+            FROM("order_child ");
+            WHERE("(user_no = #{param.userNo} or driver_user_no = #{param.userNo}) ");
+
+//            if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
+
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+    public String pageSearchOrderChildOfDriver(@Param("page") Page<OrderChildVO> page, @Param("param") PageOrderChildOfDriverSearchParam param) {
+        return new SQL(){{
+            SELECT("child_no,goods_name,freight_price," +
+                    "send_address,receive_address," +
+                    "driver_user_no, driver_name,driver_mobile," +
+                    "truck_no," +
+                    "unload_pound_no,weight," +
                     "cancel_remark," +
                     "pound_status,status," +
                     "date_format(load_deadline, '%Y-%m-%d %H:%i:%s') as loadDeadline," +
@@ -36,7 +57,6 @@ public class OrderChildSqlProvider {
                     " or receive_address like CONCAT(#{param.content},'%') " +
                     ")");}
 
-            if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
 
             ORDER_BY("create_time desc");
         }}.toString();