From 8dcbe3d898f6c60ef3226095d994ca8953bf5f6d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 18:18:37 +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 | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 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 a75c198..cdfdf12 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
@@ -30,10 +30,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -237,10 +234,12 @@
.selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
.selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
.selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
+ .selectAs(YwAccount::getTitle,YwContractRevenue::getAccountTitle)
.leftJoin(YwContractBill.class,YwContractBill::getId,YwContractRevenue::getBillId)
.leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
+ .leftJoin(YwAccount.class,YwAccount::getId,YwContractRevenue::getAccountId)
.eq(YwContractRevenue::getId,id)
);
@@ -372,7 +371,7 @@
public List<YwContractRevenue> findList(YwContractRevenue ywContractRevenue) {
List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectJoinList(YwContractRevenue.class,new MPJLambdaWrapper<YwContractRevenue>()
.selectAll(YwContractRevenue.class)
- .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerNme)
+ .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
.leftJoin(YwContract.class,YwContract::getId,YwContractRevenue::getContractId)
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
.eq(YwContractRevenue::getStatus,Constants.ZERO)
@@ -390,6 +389,7 @@
IPage<YwContractRevenue> iPage = ywContractRevenueMapper.selectJoinPage(page,YwContractRevenue.class,
queryWrapper.selectAll(YwContractRevenue.class)
.selectAs(YwContractBill::getCode,YwContractRevenue::getBillCode)
+ .selectAs(YwContractBill::getType,YwContractRevenue::getBillType)
.selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
.selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
.selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
@@ -398,8 +398,8 @@
.leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
.eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
- .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerNme()),
- YwCustomer::getName,model.getCustomerNme())
+ .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerName()),
+ YwCustomer::getName,model.getCustomerName())
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getPayType()),
YwContractRevenue::getPayType,model.getPayType())
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getRevenueType()),
@@ -413,25 +413,39 @@
for (YwContractRevenue ywContractRevenue:iPage.getRecords()) {
//妤煎畤鍚嶇О
List<YwContractRoom> ywContractRoomList = ywContractRevenue.getYwContractRoomList();
- StringBuilder roomPathName = new StringBuilder();
- for (YwContractRoom ywContractRoom:ywContractRoomList) {
- if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
- roomPathName.append(ywContractRoom.getProjectName()+"/");
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
+ StringBuilder roomPathName = new StringBuilder();
+ for (YwContractRoom ywContractRoom:ywContractRoomList) {
+ if(Constants.equalsInteger(ywContractRevenue.getBillType(),Constants.ZERO)){
+ if(!(Constants.equalsInteger(ywContractRevenue.getContractId(),ywContractRoom.getContractId())
+ && Constants.equalsInteger(ywContractRoom.getType(),Constants.ZERO))){
+ continue;
+ }
+ }else{
+ if(!(Constants.equalsInteger(ywContractRevenue.getBillId(),ywContractRoom.getContractId())
+ && Constants.equalsInteger(ywContractRoom.getType(),Constants.ONE))){
+ continue;
+ }
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
+ roomPathName.append(ywContractRoom.getProjectName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
+ roomPathName.append(ywContractRoom.getBuildingName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
+ roomPathName.append(ywContractRoom.getFloorName()+"/");
+ }
+ if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
+ roomPathName.append(ywContractRoom.getRoomName());
+ }
+ if(StringUtils.isNotBlank(roomPathName)){
+ roomPathName.append(";");
+ }
}
- if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
- roomPathName.append(ywContractRoom.getBuildingName()+"/");
- }
- if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
- roomPathName.append(ywContractRoom.getFloorName()+"/");
- }
- if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
- roomPathName.append(ywContractRoom.getRoomName());
- }
- if(StringUtils.isNotBlank(roomPathName)){
- roomPathName.append(";");
- }
+ ywContractRevenue.setRoomPathName(roomPathName.toString());
}
- ywContractRevenue.setRoomPathName(roomPathName.toString());
+
}
return PageData.from(iPage);
}
@@ -442,24 +456,30 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRevenueList)){
//鑾峰彇鎵�鏈夋暟鎹�
List<Integer> billIdList = ywContractRevenueList.stream().map(i->i.getBillId()).collect(Collectors.toList());
+ List<Integer> contractIdList = ywContractRevenueList.stream().map(i->i.getContractId()).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(billIdList)){
List<YwContractRoom> ywContractRoomList = ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
.selectAll(YwContractRoom.class)
.selectAs(YwProject::getName,YwRoom::getProjectName)
.selectAs(YwFloor::getName,YwRoom::getFloorName)
.selectAs(YwBuilding::getName,YwRoom::getBuildingName)
- .selectAs(YwRoom::getName,YwContractRoom::getRoomName)
+ .selectAs(YwRoom::getCode,YwContractRoom::getRoomName)
.leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
.leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
.leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
.leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
- .in(YwContractRoom::getContractId,billIdList)
- .eq(YwContractRoom::getType,Constants.ONE)
+ .and(i->i.in(YwContractRoom::getContractId,billIdList).eq(YwContractRoom::getType,Constants.ONE)
+ .or().in(YwContractRoom::getContractId,contractIdList).eq(YwContractRoom::getType,Constants.ZERO)
+ )
+// .in(YwContractRoom::getContractId,billIdList)
+// .eq(YwContractRoom::getType,Constants.ONE)
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
for (YwContractRevenue ywContractRevenue:ywContractRevenueList) {
ywContractRevenue.setYwContractRoomList(
- ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getContractId(),ywContractRevenue.getBillId())).collect(Collectors.toList())
+ ywContractRoomList.stream().filter(i->
+ Constants.equalsInteger(i.getContractId(),ywContractRevenue.getBillId())||Constants.equalsInteger(i.getContractId(),ywContractRevenue.getContractId()))
+ .collect(Collectors.toList())
);
}
}
--
Gitblit v1.9.3