From 242bea686a5a3cd4c0488cdbe72acdc17fc3b698 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 十二月 2024 18:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
index e2e4461..20da8dc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
@@ -268,6 +268,7 @@
                 new MPJLambdaWrapper<YwContractRevenue>().selectAll(YwContractRevenue.class)
                         .selectAs(YwContractBill::getCode,YwContractRevenue::getBillCode)
                         .selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
+                        .selectAs(YwContract::getStatus,YwContractRevenue::getContractStatus)
                         .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
                         .selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
                         .selectAs(YwAccount::getTitle,YwContractRevenue::getAccountTitle)
@@ -427,6 +428,7 @@
                         .selectAs(YwContractBill::getCode,YwContractRevenue::getBillCode)
                         .selectAs(YwContractBill::getType,YwContractRevenue::getBillType)
                          .selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
+                        .selectAs(YwContract::getStatus,YwContractRevenue::getContractStatus)
                         .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
                         .selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
                         .leftJoin(YwContractBill.class,YwContractBill::getId,YwContractRevenue::getBillId)

--
Gitblit v1.9.3