阜宁运维项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
MrShi
2024-12-06 139b8a6b0ca15f07f4ed80fbbe21c1474f353db2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java


@@ -209,7 +209,8 @@


        );




        //房源数据


        ywContractBill.setYwContractRoomList(ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()


        ywContractBill.setYwContractRoomList(


                ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()


                .selectAll(YwContractRoom.class)


                .selectAs(YwProject::getName,YwRoom::getProjectName)


                .selectAs(YwFloor::getName,YwRoom::getFloorName)


@@ -222,8 +223,8 @@


                .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)


                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE),YwContractRoom::getContractId,id)


                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE),YwContractRoom::getType,Constants.ONE)


                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO),YwContractRoom::getContractId,ywContractBill.getContractId())


                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO),YwContractRoom::getType,Constants.ZERO)


                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO) || Constants.equalsInteger(ywContractBill.getType(),Constants.TWO),YwContractRoom::getContractId,ywContractBill.getContractId())


                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)| Constants.equalsInteger(ywContractBill.getType(),Constants.TWO),YwContractRoom::getType,Constants.ZERO)


        ));




        //收支记录


@@ -393,7 +394,7 @@


                for (YwContractBill ywContractBill:ywContractBillList) {


                    if(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)){


                        ywContractBill.setYwContractRoomList(


                                ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList())


                                ywContractRoomList.stream().filter(i->(Constants.equalsInteger(i.getType(),Constants.TWO)||Constants.equalsInteger(i.getType(),Constants.ZERO))&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList())


                        );


                    }else{


                        ywContractBill.setYwContractRoomList(