Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunw...

MrShi

2025-02-06 098386f316ecaa7122bc979809d8160db81304ed

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java

@@ -12,6 +12,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dto.YwContractBillDTO;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.SystemUserMapper;
@@ -25,6 +26,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -78,13 +80,18 @@
        model.setCreator(model.getLoginUserInfo().getId());
        model.setIsdeleted(Constants.ZERO);
        model.setCreateDate(new Date());
        model.setStatus(Constants.ZERO);
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        model.setStatus(Constants.ZERO);//待执行
        if(model.getStartDate().getTime() > System.currentTimeMillis()){
            model.setStatus(Constants.ZERO);
        }else if(model.getStartDate().getTime() <= System.currentTimeMillis() && model.getEndDate().getTime() > System.currentTimeMillis()){
            model.setStatus(Constants.ONE);
        }else{
            model.setStatus(Constants.TWO);
        }
        model.setRemark(getRemarlByParam(model));
        ywContractMapper.insert(model);
        dealDetailListBiz(model);//处理条款信息
        dealDetailListBiz(model,false);//处理条款信息
        dealMultifileBiz(model);//处理附件信息
        dealRoomsForContract(model);//处理房源关联表
        dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,model.getLoginUserInfo().getRealname(),"【"+model.getRemark().replace("合同摘要：","")+"】");//记录新建日志
@@ -155,7 +162,7 @@
        isParamValidForBill(model);
        model.setCreateDate(new Date());
        model.setEditDate(model.getCreateDate());
        dealDetailListBiz(model);//处理条款信息
        dealDetailListBiz(model,true);//处理条款信息
        return model.getBillList();
    }

@@ -170,8 +177,7 @@
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写合同信息");
        }
        if(model.getEndDate().getTime()<= model.getStartDate().getTime()){

        if(model.getEndDate().getTime()< model.getStartDate().getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，合同有效期结束时间不得早于开始时间！");
        }

@@ -204,7 +210,7 @@
                ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写租赁条款信息!");
                }
                if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
                if(d.getEndDate().getTime()< d.getStartDate().getTime()){

                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，租赁条款有效期结束时间不得早于开始时间！");
                }
@@ -308,16 +314,19 @@
                .replace("{param3}",DateUtil.getDateLongSlash(model.getBtDate()))
                .replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"收":"付")
                .replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
                        Constants.formatBigdecimal2Float(model.getBtFee()).intValue()
                        :(Constants.formatBigdecimal2Float(model.getBtFee()).intValue() * -1))+"" );
                        Constants.formatBigdecimal2Float(model.getBtFee())
                        :(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
        return  str;
    }
    private String getbackRentLogByParam(YwContract model) {
        BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
        String str = "【退租日{param1}，退租原因：{param2},退租协议中统计的费用总计{param3}元。】";
        String str = "【退租日{param1}，退租原因：{param2},退租协议中统计的费用总计需{param4}{param5}元。】";
        str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getBtDate()))
                .replace("{param2}",StringUtils.defaultString(model.getBtInfo(),""))
                .replace("{param3}",Constants.formatBigdecimal2Float(model.getBtFee()).doubleValue()+"");
                .replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"收":"付")
                .replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
                        Constants.formatBigdecimal2Float(model.getBtFee())
                        :(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
        return  str;
    }

@@ -354,9 +363,6 @@
        update.setBtFee(param.getBtFee());
        update.setBtRemark(getbackRentRemarkByParam(param));
        ywContractMapper.updateById(update);
//        if(1==1){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
//        }
        dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK, param.getLoginUserInfo().getRealname(),getbackRentLogByParam(param));
        return param.getId();
    }
@@ -380,7 +386,7 @@
                .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
                .eq(YwContract::getIsdeleted,Constants.ZERO)
                .in(YwContract::getStatus,Constants.ONE,Constants.ZERO)
                .apply(" END_DATE < NOW() ")
                .apply(" END_DATE < CURRENT_DATE ")
        );

    }
@@ -392,6 +398,7 @@
        List<YwContractBill> noBills = new ArrayList<>();//不需要结算的账单
        List<YwContractBill> yjBills = new ArrayList<>();//押金账单
        List<YwContractBill> canBills = new ArrayList<>();//可退租修改数据
        Integer canBillCount = Constants.ZERO;
        List<YwContractBill> allBills = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>().
                select("*," +
                        "( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE  else  -yw.ACT_RECEIVABLE_FEE end),0) from  yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as  actReceivableFee " )
@@ -413,28 +420,23 @@
                        ||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
                    if(bill.getStartDate().getTime()<=param.getBtDate().getTime()){
                        canBills.add(bill);
                        canBillCount = canBillCount ++;
                    }else{
                        //如果还没开始，账单直接关闭
                        closeBills.add(bill);
                        noBills.add(bill);
                    }
//                    if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
//                        //如果还没开始，账单直接关闭
//                        closeBills.add(bill);
//                        noBills.add(bill);
//                    }else{
//                        canBills.add(bill);
//                    }
                }else  if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
                    if(bill.getStartDate().getTime()>param.getBtDate().getTime()){
//                    if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
                        //如果已结清，账单直接关闭
                        noBills.add(bill);
                    }else{
                        canBills.add(bill);
                        canBillCount = canBillCount ++;
                    }
                }else  if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
                     canBills.add(bill);
                    canBillCount = canBillCount ++;
                }
            }
        }
@@ -462,14 +464,15 @@
                    if(fee.compareTo(new BigDecimal(0))== 0){
                        //如果费用正好，则修改账单信息为已结清
                        b.setPayStatus(Constants.ONE);
                        canBillCount = canBillCount --;
                    }else if(fee.compareTo(new BigDecimal(0))> 0){
                        //如果需要进行退款，更新账单信息为待退款
                        b.setPayStatus(Constants.FOUR);
                    }else if(fee.compareTo(new BigDecimal(0)) < 0){
                        //如果账单还有款待收，则保持状态不变
                    }
                    b.setReceivableFee(editBill.getReceivableFee());
                }
                b.setReceivableFee(editBill.getReceivableFee());
                b.setEditDate(param.getEditDate());
                b.setEditor(param.getEditor());
                b.setBtActDate(param.getBtActDate());
@@ -488,8 +491,12 @@
            for(YwContractBill addBill : param.getAddBillList()){
                addBill.setIsdeleted(Constants.ZERO);
                addBill.setContractId(param.getId());
                addBill.setCreateDate(new Date());
                addBill.setCreator(param.getEditor());
                addBill.setType(Constants.TWO);
                addBill.setStatus(Constants.ZERO);
                addBill.setTotleFee(addBill.getReceivableFee());
                addBill.setCompanyId(param.getCompanyId());
                if(Constants.equalsInteger(addBill.getFeeType(),Constants.ONE)){
                    addBill.setStartDate(addBill.getPlanPayDate());
                    addBill.setEndDate(addBill.getPlanPayDate());
@@ -547,7 +554,7 @@
                }
            }
        }
        param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//未清算的账单数量
        param.setBtWaitBill(canBillCount  + newBills.size()+yjNoBills);//未清算的账单数量
        param.setBtCLoseBill(closeBills.size());
        param.setBtFee(totalBackFee);
    }
@@ -597,7 +604,11 @@
        }
    }

    private void dealDetailListBiz(YwContract model) {
    /**
     * @param model
     * @param createBill  根据条款生成账单 false 则根据前端编辑后的数据生成
     */
    private void dealDetailListBiz(YwContract model,boolean createBill) {
        List<YwContractDetail> details1 = new ArrayList<>();
        List<YwContractDetail> details2 = new ArrayList<>();
        int num = 0;
@@ -637,7 +648,90 @@
            }
        }
        //处理账单信息
        dealBillListBiz(model,details1,details2);
        if(createBill){
            dealBillListBiz(model,details1,details2);
        }else{
            //2025-1-23 13:56:53 加入 前端入参调整后的账单信息
            List<YwContractBill> ywContractBillList = new ArrayList<>();
            //查询租赁条款
            if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                    || Constants.equalsInteger(model.getType(),Constants.TWO)&& com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(details1)){
                YwContractDetail ywContractDetail = details1.get(Constants.ZERO);
                YwContractBill zlBill = new YwContractBill();
                BeanUtils.copyProperties(model.getZlBillDTO(),zlBill);
                zlBill.setCreator(model.getCreator());
                zlBill.setCreateDate(model.getCreateDate());
                zlBill.setIsdeleted(Constants.ZERO);
                zlBill.setStatus(Constants.ZERO);
                zlBill.setReceivableFee(zlBill.getTotleFee());
                zlBill.setType(Constants.ZERO);
                zlBill.setCompanyId(model.getCompanyId());
                zlBill.setContractId(model.getId());
                zlBill.setBillType(Constants.ZERO);
                zlBill.setPayStatus(Constants.ZERO);
                ywContractBillList.add(zlBill);
                Integer sortnum = Constants.ONE;
                for (YwContractBillDTO zlBillDTO:model.getZlBillDTOList()) {
                    YwContractBill zl = new YwContractBill();
                    BeanUtils.copyProperties(zlBillDTO,zl);
                    zl.setCreator(model.getCreator());
                    zl.setCreateDate(model.getCreateDate());
                    zl.setIsdeleted(Constants.ZERO);
                    zl.setStatus(Constants.ZERO);
                    zl.setReceivableFee(zl.getTotleFee());
                    zl.setType(Constants.ZERO);
                    zl.setCompanyId(model.getCompanyId());
                    zl.setContractId(model.getId());
                    zl.setBillType(Constants.ZERO);
                    zl.setPayStatus(Constants.ZERO);
                    zl.setSortnum(sortnum);
                    zl.setDetailId(ywContractDetail.getId());
                    ywContractBillList.add(zl);
                    sortnum++;
                }
            }
            //查询物业账单
            if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                    || Constants.equalsInteger(model.getType(),Constants.TWO)&& com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(details2)){
                YwContractDetail ywContractDetail = details2.get(Constants.ZERO);
                YwContractBill wyBill = new YwContractBill();
                BeanUtils.copyProperties(model.getWyBillDTO(),wyBill);
                wyBill.setCreator(model.getCreator());
                wyBill.setCreateDate(model.getCreateDate());
                wyBill.setIsdeleted(Constants.ZERO);
                wyBill.setStatus(Constants.ZERO);
                wyBill.setReceivableFee(wyBill.getTotleFee());
                wyBill.setType(Constants.ZERO);
                wyBill.setCompanyId(model.getCompanyId());
                wyBill.setContractId(model.getId());
                wyBill.setBillType(Constants.ZERO);
                wyBill.setPayStatus(Constants.ZERO);
                ywContractBillList.add(wyBill);
                Integer sortnum = Constants.ONE;
                for (YwContractBillDTO wyBillDTO:model.getWyBillDTOList()) {
                    YwContractBill wy = new YwContractBill();
                    BeanUtils.copyProperties(wyBillDTO,wy);
                    wy.setCreator(model.getCreator());
                    wy.setCreateDate(model.getCreateDate());
                    wy.setIsdeleted(Constants.ZERO);
                    wy.setStatus(Constants.ZERO);
                    wy.setReceivableFee(wy.getTotleFee());
                    wy.setType(Constants.ZERO);
                    wy.setCompanyId(model.getCompanyId());
                    wy.setContractId(model.getId());
                    wy.setBillType(Constants.ZERO);
                    wy.setPayStatus(Constants.ZERO);
                    wy.setSortnum(sortnum);
                    wy.setDetailId(ywContractDetail.getId());
                    ywContractBillList.add(wy);
                    sortnum++;
                }
            }
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractBillList)){
                ywContractBillMapper.insert(ywContractBillList);
            }
        }

    }

    /**
@@ -699,13 +793,19 @@
        }
        int num =1;
        for(int i=0;i<billList1.size();i++){
            if(Constants.formatBigdecimal(billList1.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
                billList1.get(i).setPayStatus(Constants.ONE);
            }
            if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ZERO)){
                billList1.get(i).setSortnum(num);
                num++;
            }
        }
        for(int i=0;i<billList2.size();i++){
            if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ONE)) {
            if(Constants.formatBigdecimal(billList2.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
                billList2.get(i).setPayStatus(Constants.ONE);
            }
            if(Constants.equalsInteger(billList2.get(i).getCostType(),Constants.ONE)) {
                billList2.get(i).setSortnum(num);
                num++;
            }
@@ -1029,8 +1129,7 @@
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写合同信息");
        }
        if(model.getEndDate().getTime()<= model.getStartDate().getTime()){

        if(model.getEndDate().getTime()< model.getStartDate().getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，合同有效期结束时间不得早于开始时间！");
        }
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -1066,7 +1165,7 @@
                ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请按页面要求填写租赁条款信息!");
                }
                if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
                if(d.getEndDate().getTime()< d.getStartDate().getTime()){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，租赁条款有效期结束时间不得早于开始时间！");
                }
                if(d.getEndDate().getTime()>model.getEndDate().getTime() ||d.getStartDate().getTime()<model.getStartDate().getTime()){
@@ -1174,7 +1273,53 @@
        if(user ==null || (user.getDeleted()!=null && user.getDeleted()) ){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，经办人信息不存在，请尝试刷新页面重试！");
        }
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(model.getYwContractBillDTOList())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"无账单信息，请刷新重试");
        }
        for (YwContractBillDTO billDTO:model.getYwContractBillDTOList()) {
            if(
                    Objects.isNull(billDTO.getStartDate())
                    ||Objects.isNull(billDTO.getEndDate())
                    ||Objects.isNull(billDTO.getPlanPayDate())
                    ||Objects.isNull(billDTO.getTotleFee())
                    ||Objects.isNull(billDTO.getCostType())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"账单明细参数错误");
            }
        }

        List<YwContractBillDTO> ywContractBillDTOList = model.getYwContractBillDTOList();
        //查询租赁条款
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                || Constants.equalsInteger(model.getType(),Constants.TWO)){
            List<YwContractBillDTO> leaseBillDTOList = ywContractBillDTOList.stream()
                    .filter(i->Constants.equalsInteger(i.getCostType(),Constants.ZERO)).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(leaseBillDTOList)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无租赁费账单！");
            }
            model.setZlBillDTOList(leaseBillDTOList);
            Optional<YwContractBillDTO> leaseBillOptional = ywContractBillDTOList.stream()
                    .filter(i->Constants.equalsInteger(i.getCostType(),Constants.TWO)).findAny();
            if(!leaseBillOptional.isPresent()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无租赁押金账单！");
            }
            model.setZlBillDTO(leaseBillOptional.get());
        }
        if(Constants.equalsInteger(model.getType(),Constants.ZERO )
                || Constants.equalsInteger(model.getType(),Constants.ONE)){
            List<YwContractBillDTO> wyBillDTOList = ywContractBillDTOList.stream()
                    .filter(i->Constants.equalsInteger(i.getCostType(),Constants.ONE)).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(wyBillDTOList)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无物业费账单！");
            }
            model.setWyBillDTOList(wyBillDTOList);
            Optional<YwContractBillDTO> wyBillOptional = ywContractBillDTOList.stream()
                    .filter(i->Constants.equalsInteger(i.getCostType(),Constants.THREE)).findAny();
            if(!wyBillOptional.isPresent()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无物业押金账单！");
            }
            model.setWyBillDTO(wyBillOptional.get());
        }
    }

    @Override
@@ -1262,38 +1407,38 @@
        if (model == null) {
                throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
            //合同附件
            initFiles(model);
            //查询房源信息数据
            MPJLambdaWrapper<YwRoom> rw = new MPJLambdaWrapper<>();
            rw.selectAll(YwRoom.class)
                    .selectAs(YwProject::getName, YwRoom::getProjectName)
                    .selectAs(YwFloor::getName, YwRoom::getFloorName)
                    .selectAs(YwBuilding::getName, YwRoom::getBuildingName)
                    .leftJoin(YwProject.class, YwProject::getId, YwRoom::getProjectId)
                    .leftJoin(YwBuilding.class, YwBuilding::getId, YwRoom::getBuildingId)
                    .leftJoin(YwFloor.class, YwFloor::getId, YwRoom::getFloor)
                    .eq(YwRoom::getIsdeleted, Constants.ZERO)
                    .exists("(select a.id from yw_contract_room a where a.isdeleted=0 and a.type=0 and a.room_id=t.id and a.contract_id=" + model.getId() + ")");
            model.setRoomList(roomMapper.selectJoinList(YwRoom.class, rw));
            model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
            model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
            //查询租賃条款信息
            MPJLambdaWrapper<YwContractDetail> dw = new MPJLambdaWrapper<>();
            dw.selectAll(YwContractDetail.class)
                    .eq(YwContractDetail::getIsdeleted, Constants.ZERO)
                    .eq(YwContractDetail::getContractId, model.getId())
                    .in(YwContractDetail::getType, Constants.ZERO, Constants.TWO)
                    .orderByAsc(YwContractDetail::getSortnum);
            model.setZlDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class, dw));
            //查询物業条款信息
            dw = new MPJLambdaWrapper<>();
            dw.selectAll(YwContractDetail.class)
                    .eq(YwContractDetail::getIsdeleted, Constants.ZERO)
                    .eq(YwContractDetail::getContractId, model.getId())
                    .in(YwContractDetail::getType, Constants.ONE, Constants.THREE)
                    .orderByAsc(YwContractDetail::getSortnum);
            model.setWyDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class, dw));
        //合同附件
        initFiles(model);
        //查询房源信息数据
        MPJLambdaWrapper<YwRoom> rw = new MPJLambdaWrapper<>();
        rw.selectAll(YwRoom.class)
                .selectAs(YwProject::getName, YwRoom::getProjectName)
                .selectAs(YwFloor::getName, YwRoom::getFloorName)
                .selectAs(YwBuilding::getName, YwRoom::getBuildingName)
                .leftJoin(YwProject.class, YwProject::getId, YwRoom::getProjectId)
                .leftJoin(YwBuilding.class, YwBuilding::getId, YwRoom::getBuildingId)
                .leftJoin(YwFloor.class, YwFloor::getId, YwRoom::getFloor)
                .eq(YwRoom::getIsdeleted, Constants.ZERO)
                .exists("(select a.id from yw_contract_room a where a.isdeleted=0 and a.type=0 and a.room_id=t.id and a.contract_id=" + model.getId() + ")");
        model.setRoomList(roomMapper.selectJoinList(YwRoom.class, rw));
        model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
        model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
        //查询租賃条款信息
        MPJLambdaWrapper<YwContractDetail> dw = new MPJLambdaWrapper<>();
        dw.selectAll(YwContractDetail.class)
                .eq(YwContractDetail::getIsdeleted, Constants.ZERO)
                .eq(YwContractDetail::getContractId, model.getId())
                .in(YwContractDetail::getType, Constants.ZERO, Constants.TWO)
                .orderByAsc(YwContractDetail::getSortnum);
        model.setZlDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class, dw));
        //查询物業条款信息
        dw = new MPJLambdaWrapper<>();
        dw.selectAll(YwContractDetail.class)
                .eq(YwContractDetail::getIsdeleted, Constants.ZERO)
                .eq(YwContractDetail::getContractId, model.getId())
                .in(YwContractDetail::getType, Constants.ONE, Constants.THREE)
                .orderByAsc(YwContractDetail::getSortnum);
        model.setWyDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class, dw));

        return model;
    }
@@ -1327,9 +1472,13 @@
        if(model.getBillList()!=null && model.getBillList().size()>0){
            for(YwContractBill bill: model.getBillList()){
                //付款状态：0=待收款；1=已结清；2=部分结清；3=待付款；4=待退款；5=已关闭
                if( Constants.formatBigdecimal(bill.getReceivableFee()).compareTo(new BigDecimal(0)) ==0){
                    //如果还没开始，账单直接关闭
                    continue;
                }
                if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
                        ||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
                    if(bill.getStartDate().getTime()>nowEnd){
                    if(bill.getStartDate().getTime()>nowEnd ){
                        //如果还没开始，账单直接关闭
                        continue;
                    }
@@ -1411,7 +1560,8 @@
        queryWrapper.selectAll(YwContract.class )
                .selectAs(Company::getName,YwContract::getCompanyName )
                .selectAs(YwCustomer::getName,YwContract::getRenterName )
                .select("(select sum(r.area) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)",YwContract::getTotalArea )
                .select("(select sum(r.RENT_AREA) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)",YwContract::getTotalArea )
                .select(" ( select  ifnull(sum(y.TOTLE_FEE),0)  from yw_contract_bill y   where y.CONTRACT_ID = t.id and y.type = 0 and y.COST_TYPE=0 and y.BILL_TYPE = 0 ) " , YwContract::getTotalFee)
                .leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
                .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
        Utils.MP.blankToNull(pageWrap.getModel());
@@ -1507,10 +1657,6 @@
            queryWrapper.le(YwContract::getWyFreeEndDate, Utils.Date.getEnd(pageWrap.getModel().getWyFreeEndDate()));
        }





        if (pageWrap.getModel().getZlTotalFee() != null) {
            queryWrapper.eq(YwContract::getZlTotalFee, pageWrap.getModel().getZlTotalFee());
        }
@@ -1520,6 +1666,12 @@
        if (pageWrap.getModel().getCompanyName() != null) {
            queryWrapper.like(Company::getName, pageWrap.getModel().getCompanyName());
        }
        if (pageWrap.getModel().getRoomId() != null) {
            queryWrapper.apply(" t.id in ( select ycr.CONTRACT_ID from yw_contract_room ycr where ycr.type = 0 and  ycr.ROOM_ID = "+pageWrap.getModel().getRoomId()+" )  ");
        }
        if (pageWrap.getModel().getBuildingId() != null) {
            queryWrapper.apply(" t.id in ( select ycr.CONTRACT_ID from yw_contract_room ycr left join yw_room yr on ycr.ROOM_ID = yr.id where ycr.type = 0 and  yr.BUILDING_ID = "+pageWrap.getModel().getBuildingId()+" )  ");
        }
        queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwContract::getStartDate, pageWrap.getModel().getQueryStartTime())
                        .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwContract::getEndDate, pageWrap.getModel().getQueryEndTime());
        queryWrapper.orderByDesc(YwContract::getCreateDate );
@@ -1528,6 +1680,28 @@
            for(YwContract model : data.getRecords()){
                model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
                model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
                //查询房源信息数据
                MPJLambdaWrapper<YwRoom> rw = new MPJLambdaWrapper<>();
                rw.selectAll(YwRoom.class)
                        .selectAs(YwProject::getName, YwRoom::getProjectName)
                        .selectAs(YwFloor::getName, YwRoom::getFloorName)
                        .selectAs(YwBuilding::getName, YwRoom::getBuildingName)
                        .leftJoin(YwProject.class, YwProject::getId, YwRoom::getProjectId)
                        .leftJoin(YwBuilding.class, YwBuilding::getId, YwRoom::getBuildingId)
                        .leftJoin(YwFloor.class, YwFloor::getId, YwRoom::getFloor)
                        .eq(YwRoom::getIsdeleted, Constants.ZERO)
                        .exists("(select a.id from yw_contract_room a where a.isdeleted=0 and a.type=0 and a.room_id=t.id and a.contract_id=" + model.getId() + ")");
                model.setRoomList(roomMapper.selectJoinList(YwRoom.class, rw));
                model.setLeaseDays(
                        DateUtil.daysBetweenDates(model.getEndDate(),model.getStartDate()) + 1
                );
                if(Objects.nonNull(model.getLeaseDays())&&Objects.nonNull(model.getTotalArea())&&Objects.nonNull(model.getTotalFee())){
                    model.setLeasePrice(model.getTotalFee().divide((model.getTotalArea().multiply(new BigDecimal(model.getLeaseDays()))),2,BigDecimal.ROUND_HALF_UP));
                }else{
                    model.setLeasePrice(BigDecimal.ZERO);
                }


            }
        }
        return data;