列表筛选和增加合并明细接口等

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/SettlementMergeDetailVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName SettlementMergeDetailVO
+ * @Description
+ * @Author kavin
+ * @Date 2023/12/19 14:18
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+public class SettlementMergeDetailVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+    @ApiModelProperty("结算子单号")
+    private String settlementNo;                    //结算单编号
+    @ApiModelProperty("结算单号")
+    private String settlementSubNo;                 //结算子单号
+    @ApiModelProperty("操作人")
+    private String mergedBy;                         //合并人
+    @ApiModelProperty("合并结算单时间")
+    private String mergeTime;                       //合并结算单时间
+
+}

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

@@ -11,6 +11,7 @@ import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
-
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -137,5 +138,10 @@ public class CarrierSettlementOwnerController {
         return Result.ok();
     }
 
-
+    @ApiOperation(value = "结算单合并明细",notes = "<br>By:刘海泉")
+    @GetMapping("/settlementMergeDetail")
+    public Result<List<SettlementMergeDetailVO>> settlementMergeDetail(@ApiParam("结算单号") @NotNull(message = "结算单号不能为空") String settlementNo) {
+        List<SettlementMergeDetailVO> list  = settlementOwnerService.settlementMergeDetail(settlementNo);
+        return Result.ok(list);
+    }
 }

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

@@ -8,6 +8,7 @@ import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.carrier.settle.SettlementMergeDetailVO;
 import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
@@ -16,6 +17,7 @@ import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -26,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
-
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -104,7 +106,12 @@ public class OwnerSettlementOwnerController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
-
+    @ApiOperation(value = "结算单合并明细",notes = "<br>By:刘海泉")
+    @GetMapping("/settlementMergeDetail")
+    public Result<List<SettlementMergeDetailVO>> settlementMergeDetail(@ApiParam("结算单号") @NotNull(message = "结算单号不能为空") String settlementNo) {
+        List<SettlementMergeDetailVO> list  = settlementOwnerService.settlementMergeDetail(settlementNo);
+        return Result.ok(list);
+    }
 
 
 }

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

@@ -573,4 +573,10 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         //更新货主运单计费明细
         settlementOwnerDetailDao.updateSettlementMerge(settlementNo,settlementNos);
     }
+
+    @Override
+    public List<SettlementMergeDetailVO> settlementMergeDetail(String settlementNo) {
+        List<SettlementOwner> list  = settlementOwnerDao.listByField(SettlementOwner :: getSettlementSubNo,settlementNo);
+        return settlementOwnerStruct.convertToMergeDetailVOList(list);
+    }
 }

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

@@ -7,6 +7,8 @@ import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
+import java.util.List;
+
 /**
  * @author liruixin
  * Date 2023-10-12
@@ -53,4 +55,6 @@ public interface SettlementOwnerService {
     void payeeConfirm(String settlementNo);
 
     void mergeOwnerSettlement(MergeOwnerSettlementParam param);
+
+    List<SettlementMergeDetailVO> settlementMergeDetail(String settlementNo);
 }

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

@@ -37,5 +37,11 @@ public interface SettlementOwnerStruct {
 
     CarrierSettlementOwnerExpressVO convertToExpress(SettlementOwner settlementOwner);
 
+    @Mapping(target = "settlementNo", source = "settlementSubNo")
+    @Mapping(target = "settlementSubNo", source = "settlementNo")
+    List<SettlementMergeDetailVO> convertToMergeDetailVOList(List<SettlementOwner> list);
+
+
+
 
 }