commit

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

@@ -16,7 +16,7 @@ public class PageCarrierSettlementDriverDetailParam extends PageParam {
     @ApiModelProperty(value = "运单编号", example = "JS415")
     private String childNo;
 
-    @ApiModelProperty(value="货主编码",example = "201457878")
+    @ApiModelProperty(value="车主编码",example = "201457878")
     private Long driverUserNo;
 
     @ApiModelProperty(value="订单编号",example = "201457878")

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

 package com.clx.performance.dao.impl.settle;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.mapper.settle.SettlementDriverDetailMapper;
 import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.util.Objects;
+
 /**
  * @Author: aiqinguo
  * @Description: 车主运单计费明细
@@ -14,6 +21,18 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> implements SettlementDriverDetailDao {
-
-
+    @Override
+    public IPage<SettlementDriverDetail> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param) {
+        LambdaQueryWrapper<SettlementDriverDetail> query = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getChildNo())){
+            query.eq(SettlementDriverDetail :: getChildNo,param.getChildNo());
+        }
+        if(StringUtils.isNotBlank(param.getOrderNo())){
+            query.eq(SettlementDriverDetail :: getOrderNo,param.getOrderNo());
+        }
+        if(Objects.nonNull(param.getDriverUserNo())){
+            query.eq(SettlementDriverDetail :: getDriverUserNo,param.getDriverUserNo());
+        }
+        return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDetailDao.java

 package com.clx.performance.dao.settle;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.settle.SettlementDriverDetailMapper;
 import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
 import com.msl.common.dao.BaseDao;
 
 /**
@@ -11,5 +13,5 @@ import com.msl.common.dao.BaseDao;
  * @Version: 1.0
  */
 public interface SettlementDriverDetailDao extends BaseDao<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> {
-
+    IPage<SettlementDriverDetail> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param);
 }

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

 package com.clx.performance.service.impl.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementDriverDetailParam;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
+import com.clx.performance.struct.settle.SettlementDriverDetailStruct;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author liruixin
  * Date 2023-10-12
  * Time 09:43
  */
 @Service
+@Slf4j
+@AllArgsConstructor
 public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetailService {
+
+    private final SettlementDriverDetailDao settlementDriverDetailDao;
+    private final SettlementDriverDetailStruct settlementOwnerDetailStruct;
+
+
     @Override
     public IPage<CarrierPageSettlementDriverDetailVO> pageSettlementDriverDetail(
             PageCarrierSettlementDriverDetailParam param) {
-        return null;
+        IPage<SettlementDriverDetail> result = settlementDriverDetailDao.pageSettlementDriverDetail(param);
+        List<CarrierPageSettlementDriverDetailVO> list = settlementOwnerDetailStruct.covertList(result.getRecords());
+        return new Page<CarrierPageSettlementDriverDetailVO>().setRecords(list).setTotal(result.getTotal()).setPages(result.getPages());
     }
 }

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementDriverDetailStruct.java

+package com.clx.performance.struct.settle;
+
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface SettlementDriverDetailStruct {
+    List<CarrierPageSettlementDriverDetailVO> covertList(List<SettlementDriverDetail> records);
+}