|
@@ -52,8 +52,8 @@ public class KwpSettlementLogisticsController {
|
|
|
*/
|
|
*/
|
|
|
@PostMapping(name = "运费收款-根据条件导出物流订单表数据", path = "exportCollection")
|
|
@PostMapping(name = "运费收款-根据条件导出物流订单表数据", path = "exportCollection")
|
|
|
public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
|
|
public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
|
|
|
- settlementReq.setUnitType(LogisticsUnitType.CARRIER);
|
|
|
|
|
- settlementReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
|
|
|
|
|
|
|
+ settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
|
|
|
|
|
+ settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
|
|
|
List<SettlementLogisticsDto> list;
|
|
List<SettlementLogisticsDto> list;
|
|
|
list = kwpSettlementLogisticsService.selectList(settlementReq);
|
|
list = kwpSettlementLogisticsService.selectList(settlementReq);
|
|
|
return this.export(response, list);
|
|
return this.export(response, list);
|
|
@@ -85,8 +85,8 @@ public class KwpSettlementLogisticsController {
|
|
|
*/
|
|
*/
|
|
|
@PostMapping(name = "运费付款-根据条件导出物流订单表数据", path = "exportPayment")
|
|
@PostMapping(name = "运费付款-根据条件导出物流订单表数据", path = "exportPayment")
|
|
|
public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
|
|
public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
|
|
|
- settlementReq.setUnitType(LogisticsUnitType.SHIPPER);
|
|
|
|
|
- settlementReq.setUnitTypeTwo(LogisticsUnitType.CARRIER);
|
|
|
|
|
|
|
+ settlementReq.setUnitType(LogisticsUnitType.CARRIER);
|
|
|
|
|
+ settlementReq.setUnitTypeTwo(LogisticsUnitType.SHIPPER);
|
|
|
List<SettlementLogisticsDto> list;
|
|
List<SettlementLogisticsDto> list;
|
|
|
list = kwpSettlementLogisticsService.selectList(settlementReq);
|
|
list = kwpSettlementLogisticsService.selectList(settlementReq);
|
|
|
return this.export(response, list);
|
|
return this.export(response, list);
|