2023年1月30日17:32:10

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Items.java

@@ -330,6 +330,13 @@ public class Items implements Serializable {
 	 */
 	@ApiModelProperty(value = "车队")
 	private Long fleetId;
+
+	/**
+	 * 车队
+	 */
+	@ApiModelProperty(value = "车队")
+	@TableField(exist = false)
+	private String fleetName;
 	/**
 	 * 车号
 	 */
@@ -356,4 +363,11 @@ public class Items implements Serializable {
 	@TableField("DC")
 	private String dc;
 
+	/**
+	 * 来源业务日期（业务模块的日 订单日期 和发货单日期 收货单日期模块
+	 */
+	@ApiModelProperty(value = "来源业务日期（业务模块的日 订单日期 和发货单日期 收货单日期模块 ")
+	@TableField("Src_date")
+	private String srcDate;
+
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -140,18 +140,26 @@ public class SettlementController extends BladeController {
 					}
 				}
 
-				//客户名称
-				if (ObjectUtil.isNotEmpty(e.getCorpId())) {
-					e.setCorpName(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
-				}
-				//客户名称
-				if (ObjectUtil.isNotEmpty(e.getFleetId())) {
-					e.setCorpName(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
+				if ("234557".equals(AuthUtil.getTenantId())) {
+					//客户名称
+					if (ObjectUtil.isNotEmpty(e.getCorpId())) {
+						e.setCorpName(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
+					}
+					//客户名称
+					if (ObjectUtil.isNotEmpty(e.getFleetId())) {
+						e.setFleetName(corpsDescClient.getCorpMessage(e.getFleetId()).getData().getCname());
+					}
+				} else {
+					//客户名称
+					if (ObjectUtil.isNotEmpty(e.getCorpId())) {
+						e.setCorpName(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
+					}
 				}
+
 				//费用名称
 				if (StringUtil.isNotBlank(e.getCostType())) {
 					R<FeesDesc> r = iFeesDescClient.detail(Long.valueOf(e.getCostType()));
-					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())){
+					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 						e.setItemName(r.getData().getCname());
 					}
 				}
@@ -199,7 +207,7 @@ public class SettlementController extends BladeController {
 		settlementLambdaQueryWrapper.le(Func.isNotEmpty(settlement.getCompletionTimeEnd()), Settlement::getCompletionTime, settlement.getCompletionTimeEnd());//单据完成结束日期
 		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
 		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
-		settlementLambdaQueryWrapper.like(ObjectUtil.isNotEmpty(settlement.getAmount()),Settlement::getAmount, settlement.getAmount());//金额
+		settlementLambdaQueryWrapper.like(ObjectUtil.isNotEmpty(settlement.getAmount()), Settlement::getAmount, settlement.getAmount());//金额
 		settlementLambdaQueryWrapper.orderByDesc(Settlement::getCreateTime);
 		IPage<Settlement> pages = settlementService.page(Condition.getPage(query), settlementLambdaQueryWrapper);
 		List<Settlement> settlementList = pages.getRecords();
@@ -215,11 +223,27 @@ public class SettlementController extends BladeController {
 	}
 
 	/**
+	 *  结算表
+	 */
+	@GetMapping("/listAll")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入settlement")
+	public R<List<Settlement>> listAll(Settlement settlement) {
+		LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
+		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
+		settlementLambdaQueryWrapper.like(settlement.getCorpId() != null, Settlement::getCorpId, settlement.getCorpId());
+		settlementLambdaQueryWrapper.eq(StringUtils.isNotBlank(settlement.getBillType()), Settlement::getBillType, settlement.getBillType());
+		List<Settlement> settlementList = settlementService.list(settlementLambdaQueryWrapper);
+		return R.data(settlementList);
+	}
+
+	/**
 	 * 付费收费导出
 	 */
 	@GetMapping("/expenseExport")
 	@ApiOperation(value = "付费收费导出", notes = "传入settlement")
-	public void expenseExport(Settlement settlement, HttpServletResponse response){
+	public void expenseExport(Settlement settlement, HttpServletResponse response) {
 		LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		settlementLambdaQueryWrapper.between(StringUtils.isNotBlank(settlement.getSettlementStartDate()) && StringUtils.isNotBlank(settlement.getSettlementEndDate()), Settlement::getSettlementDate, settlement.getSettlementStartDate(), settlement.getSettlementEndDate());
 		settlementLambdaQueryWrapper.between(StringUtils.isNotBlank(settlement.getCreateStartDate()) && StringUtils.isNotBlank(settlement.getCreateEndDate()), Settlement::getCreateTime, settlement.getCreateStartDate(), settlement.getCreateEndDate());
@@ -249,9 +273,9 @@ public class SettlementController extends BladeController {
 		}
 
 		List<ExpenseExcel> excelList = BeanUtil.copy(list, ExpenseExcel.class);
-		if(settlement.getBillType().equals("付费")){
+		if (settlement.getBillType().equals("付费")) {
 			ExcelUtil.export(response, "付款结算", "付费结算", excelList, ExpenseExcel.class);
-		}else if (settlement.getBillType().equals("收费")){
+		} else if (settlement.getBillType().equals("收费")) {
 			ExcelUtil.export(response, "收款结算", "收费结算", excelList, ExpenseExcel.class);
 		}
 	}
@@ -698,9 +722,9 @@ public class SettlementController extends BladeController {
 			throw new SecurityException("缺少必要的参数");
 		}
 		LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted,0);
-		settlementLambdaQueryWrapper.eq(Settlement::getTenantId,AuthUtil.getTenantId());
-		settlementLambdaQueryWrapper.eq(Settlement::getSrcBillId,srcId);
+		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
+		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
+		settlementLambdaQueryWrapper.eq(Settlement::getSrcBillId, srcId);
 		List<Settlement> settlementList = settlementService.list(settlementLambdaQueryWrapper);
 		return settlementList;
 	}
@@ -735,7 +759,7 @@ public class SettlementController extends BladeController {
 	@PostMapping("/collectPaymentList")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "收付款(批量)", notes = "传入order")
-	public R collectPaymentList( @RequestBody SettlementDTO dto) {
+	public R collectPaymentList(@RequestBody SettlementDTO dto) {
 		Settlement modify = settlementService.modifyParts(dto);
 		return R.data(modify);
 	}