结算单优化

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

@@ -53,6 +53,7 @@ public class PageCarrierOrderChildParam extends PageParam {
     @ApiModelProperty(value = "运单状态集合")
     private List<Integer> statusList;
 
-
+    @ApiModelProperty(value = "时间筛选类型，1：接单时间，2：磅单审核通过时间")
+    private Integer timeType;
 
 }

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

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageInvoiceOwnerSettlementOwnerDetailParam extends PageParam {
+
+    @NotNull(message = "是否已开票不能为空")
+    @ApiModelProperty(value = "是否已开票，0：否，1：是")
+    private Integer invoiceStatus;
+
+    @ApiModelProperty(value = "货主名称")
+    private String ownerName;
+
+    @ApiModelProperty(value = "结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty(value="运单编号")
+    private String childNo;
+
+    @ApiModelProperty(value="开票公司")
+    private String invoicingCompanyShorterName;
+
+    @ApiModelProperty(value="开票标识：1网运单 2普通单")
+    private Integer invoiceType;
+
+    @ApiModelProperty(value = "开始时间")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+}

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

@@ -61,6 +61,9 @@ public class PageCarrierOrderChildVO {
     @ApiModelProperty(value="完成时间",example = "2020-01-01 10:10:10")
     private String finishTime;
 
+    @ApiModelProperty(value="磅单审核通过时间",example = "2020-01-01 10:10:10")
+    private String poundAuditTime;
+
     @ApiModelProperty(value="发货地址",example = "吉林")
     private String sendAddress;
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.param.pc.carrier.ExportBatchOwnerSettlementDetailParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageInvoiceOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PagePendingCarrierSettlementOwnerDetailParam;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
@@ -57,6 +58,14 @@ public class CarrierSettlementOwnerDetailController {
         return Result.page(page.getRecords(),page.getTotal(),page.getPages());
     }
 
+    @ApiOperation(value = "开票管理待开票、已开票列表",notes = "<br>By:杨启发")
+    @PostMapping("/pageInvoiceOwnerSettlementOrderDetailList")
+    @UnitCovert(param = false)
+    public Result<PageData<PageOwnerSettlementOwnerDetailVO>> pageInvoiceOwnerSettlementOrderDetailList(@RequestBody @Validated PageInvoiceOwnerSettlementOwnerDetailParam param) {
+        IPage<PageOwnerSettlementOwnerDetailVO> page = settlementOwnerDetailService.pageInvoiceOwnerSettlementOrderDetailList(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
     @ApiOperation(value = "导出货主结算单运单明细",notes = "<br>By:姜文业")
     @PostMapping("/exportOwnerSettlementOrderDetailList")
     public void exportCarrierSettlementOwnerPageList(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param, HttpServletResponse response) throws Exception {

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

@@ -12,6 +12,7 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.carrier.ExportBatchOwnerSettlementDetailParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageInvoiceOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PagePendingCarrierSettlementOwnerDetailParam;
 import com.msl.common.base.Optional;
@@ -180,6 +181,22 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
 
+    @Override
+    public IPage<SettlementOwnerDetail> pageInvoiceOwnerSettlementOrderDetailList(PageInvoiceOwnerSettlementOwnerDetailParam param) {
+        LambdaQueryWrapper<SettlementOwnerDetail> query = new LambdaQueryWrapper<>();
+        query.in(SettlementOwnerDetail :: getFinalPaymentStatus, SettlementOwnerDetailEnum.FinalPaymentStatus.YES,SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE);
+        query.eq(SettlementOwnerDetail::getInvoiceStatus,param.getInvoiceStatus());
+        query.like(StringUtils.isNotBlank(param.getOwnerName()),SettlementOwnerDetail :: getOwnerName,param.getOwnerName());
+        query.eq(StringUtils.isNotBlank(param.getSettlementNo()),SettlementOwnerDetail :: getSettlementNo,param.getSettlementNo());
+        query.eq(StringUtils.isNotBlank(param.getChildNo()),SettlementOwnerDetail :: getChildNo,param.getChildNo());
+        query.like(StringUtils.isNotBlank(param.getInvoicingCompanyShorterName()),SettlementOwnerDetail :: getInvoicingCompanyShorterName,param.getInvoicingCompanyShorterName());
+        query.eq(Objects.nonNull(param.getInvoiceType()),SettlementOwnerDetail :: getInvoiceType,param.getInvoiceType());
+        query.between(StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime()),SettlementOwnerDetail::getCreateTime,param.getBeginTime(),param.getEndTime());
+        query.between(StringUtils.isBlank(param.getBeginTime()) || StringUtils.isBlank(param.getEndTime()),SettlementOwnerDetail::getCreateTime,LocalDateTime.now().minusMonths(3),LocalDateTime.now());
+        query.orderByAsc(SettlementOwnerDetail::getCreateTime);
+        return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
+    }
+
     @Override
     public void updateSettlementMerge(String settlementNo, List<String> settlementNos) {
          update(lUdWrapper()

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

@@ -5,6 +5,7 @@ import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.carrier.ExportBatchOwnerSettlementDetailParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageInvoiceOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PagePendingCarrierSettlementOwnerDetailParam;
 import com.msl.common.base.Optional;
@@ -35,9 +36,10 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
 
     List<SettlementOwnerDetail> getBySettlementNoAndInvoiceType(String settlementNo, Integer invoiceType, Integer invoiceStatus);
 
-
     IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
 
+    IPage<SettlementOwnerDetail> pageInvoiceOwnerSettlementOrderDetailList(PageInvoiceOwnerSettlementOwnerDetailParam param);
+
     IPage<SettlementOwnerDetail> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
 
     Integer getInvoiceType(String orderNo);

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

@@ -2254,8 +2254,9 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         fieldList.add(new ExcelField(15, "接单时间", "payTime", 5000));
         fieldList.add(new ExcelField(16, "完成时间", "finishTime", 5000));
-        fieldList.add(new ExcelField(17, "发货地址", "sendAddress", 10000));
-        fieldList.add(new ExcelField(18, "收货地址", "receiveAddress", 10000));
+        fieldList.add(new ExcelField(17, "磅单审核通过时间", "poundAuditTime", 5000));
+        fieldList.add(new ExcelField(18, "发货地址", "sendAddress", 10000));
+        fieldList.add(new ExcelField(19, "收货地址", "receiveAddress", 10000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -2288,6 +2289,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
             rowData.add(new ExcelData(dto.getPayTime()));
             rowData.add(new ExcelData(dto.getFinishTime()));
+            rowData.add(new ExcelData(dto.getPoundAuditTime()));
             rowData.add(new ExcelData(dto.getSendAddress()));
             rowData.add(new ExcelData(dto.getReceiveAddress()));
 

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

@@ -15,6 +15,7 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.carrier.ExportBatchOwnerSettlementDetailParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageInvoiceOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PagePendingCarrierSettlementOwnerDetailParam;
 import com.clx.performance.service.settle.SettlementCommonService;
@@ -178,13 +179,20 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
     @Override
     public IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
-
         IPage<SettlementOwnerDetail> settlementOwnerDetail = settlementOwnerDetailDao.pageOwnerSettlementOrderDetailList(param);
         List<PageOwnerSettlementOwnerDetailVO> list = settlementOwnerDetailStruct.covertToOwnerList(settlementOwnerDetail.getRecords());
         return new Page<PageOwnerSettlementOwnerDetailVO>().setRecords(list).setTotal(settlementOwnerDetail.getTotal()).setPages(settlementOwnerDetail.getPages());
 
     }
 
+    @Override
+    public IPage<PageOwnerSettlementOwnerDetailVO> pageInvoiceOwnerSettlementOrderDetailList(PageInvoiceOwnerSettlementOwnerDetailParam param) {
+        IPage<SettlementOwnerDetail> settlementOwnerDetail = settlementOwnerDetailDao.pageInvoiceOwnerSettlementOrderDetailList(param);
+        List<PageOwnerSettlementOwnerDetailVO> list = settlementOwnerDetailStruct.covertToOwnerList(settlementOwnerDetail.getRecords());
+        return new Page<PageOwnerSettlementOwnerDetailVO>().setRecords(list).setTotal(settlementOwnerDetail.getTotal()).setPages(settlementOwnerDetail.getPages());
+
+    }
+
     @Override
     public SXSSFWorkbook exportOwnerSettlementOrderDetail(PageOwnerSettlementOwnerDetailParam param) {
         param.setPage(1);

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

@@ -7,6 +7,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.pc.carrier.ExportBatchOwnerSettlementDetailParam;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
+import com.clx.performance.param.pc.owner.PageInvoiceOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PagePendingCarrierSettlementOwnerDetailParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPagePendingSettlementOwnerDetailVO;
@@ -25,6 +26,8 @@ public interface SettlementOwnerDetailService  {
 
     IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
 
+    IPage<PageOwnerSettlementOwnerDetailVO> pageInvoiceOwnerSettlementOrderDetailList(PageInvoiceOwnerSettlementOwnerDetailParam param);
+
     IPage<CarrierPageSettlementOwnerDetailVO> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
 
     SXSSFWorkbook exportOwnerSettlementOrderDetail(PageOwnerSettlementOwnerDetailParam param);

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

@@ -115,10 +115,16 @@ public class OrderChildSqlProvider {
                     "freight_price,send_address,receive_address,load_rough,load_tare,unload_rough,unload_tare," +
                     "driver_name,driver_mobile,load_net,unload_net," +
                     "date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
-                    "date_format(finish_time, '%Y-%m-%d %H:%i:%s') as finishTime");
+                    "date_format(finish_time, '%Y-%m-%d %H:%i:%s') as finishTime," +
+                    "date_format(pound_audit_time, '%Y-%m-%d %H:%i:%s') as poundAuditTime");
             FROM("order_child ");
+            if (Objects.equals(param.getTimeType(),1)) {
                 if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("pay_time >= #{param.beginTime}");}
                 if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("pay_time <= #{param.endTime}");}
+            }else if (Objects.equals(param.getTimeType(),2)) {
+                if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("pound_audit_time >= #{param.beginTime}");}
+                if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("pound_audit_time <= #{param.endTime}");}
+            }
 
             if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {WHERE("order_goods_no = #{param.orderGoodsNo}");}
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}