2022年12月7 18:35

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

@@ -312,4 +312,10 @@ public class Items implements Serializable {
 	 */
 	@ApiModelProperty(value = "租金开始时间")
 	private Date rentStartDate;
+
+	/**
+	 * 所属公司id
+	 */
+	@TableField(exist = false)
+	private Long belongToCorpId;
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -2814,6 +2814,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			} else {
 				Items items = new Items();
+				items.setBelongToCorpId(order.getBelongToCorpId());
 				items.setSrcOrderno(order.getOrgOrderNo());
 				items.setItemType(itemType);
 				items.setCorpId(order.getCorpId());
@@ -2880,6 +2881,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		} else {
 //			if (ObjectUtils.isNotNull(order.getSettlementList()) && order.getSettlementList().size() > 0) {
+			applyDTO.setCompanyid(order.getBelongToCorpId());
 			applyDTO.setBillType(billType);
 			applyDTO.setTradeType(order.getTradeType());
 			applyDTO.setBelongCompany(order.getBelongToCorpName());

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

@@ -203,6 +203,13 @@ public class AccController extends BladeController {
 				}
 			}
 			e.setOutstandingAmount(e.getAmount().subtract(e.getSettlementAmount()));
+			//获取所属公司中文名
+			if (e.getCompanyid() != null) {
+				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(e.getCompanyid());
+				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
+					e.setCompany(corpMessage.getData().getCname());
+				}
+			}
 		});
 		return R.data(pages);
 	}

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -1223,6 +1223,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			}
 			BeanUtils.copyProperties(e, acc);
 			acc.setId(null);
+			acc.setCompanyid(e.getBelongToCorpId());
 			acc.setItemType(e.getItemType());
 			acc.setAccSysNo(e.getSrcOrderno());
 			acc.setSrcRefno(e.getSrcOrderno());