客户资料 巡检任务业务

renkang

2024-11-25 c338f3c4de6a9d357e814e3acf23544809a8e385

客户资料 巡检任务业务

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java

@@ -105,6 +105,10 @@
    @ExcelColumn(name="总金额")
    private BigDecimal totleFee;

    @ApiModelProperty(value = "应收金额", example = "1")
    @ExcelColumn(name="应收金额")
    private BigDecimal receivableFee;

    @ApiModelProperty(value = "费用类型：0=租赁费；1=物业费；2=押金；3=保证金；4=水电费；5=杂项费；6=其他", example = "1")
    @ExcelColumn(name="费用类型：0=租赁费；1=物业费；2=押金；3=保证金；4=水电费；5=杂项费；6=其他")
    private Integer costType;
@@ -125,14 +129,31 @@
    @TableField(exist = false)
    private String customerName;

    @ApiModelProperty(value = "合同名称", example = "1")
    @TableField(exist = false)
    private String contractName;

    @ApiModelProperty(value = "公司名称", example = "1")
    @TableField(exist = false)
    private String companyName;

    @ApiModelProperty(value = "合同编号", example = "1")
    @TableField(exist = false)
    private String contractCode;

    @ApiModelProperty(value = "房间数据", example = "1")
    @TableField(exist = false)
    private List<YwRoom> ywRoomList ;


    @ApiModelProperty(value = "计划付款日 - 开始")
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date planPayDateStart;


    @ApiModelProperty(value = "计划付款日 - 结束")
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date planPayDateEnd;


    @ApiModelProperty(value = "附件信息", example = "1")
    @TableField(exist = false)
    private List<Multifile> multifileList;

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

@@ -9,10 +9,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwContractBillMapper;
import com.doumee.dao.business.YwContractRoomMapper;
import com.doumee.dao.business.model.YwContract;
import com.doumee.dao.business.model.YwContractBill;
import com.doumee.dao.business.model.YwContractRoom;
import com.doumee.dao.business.model.YwCustomer;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
import com.doumee.service.business.YwContractBillService;
@@ -59,10 +56,12 @@
                || Objects.isNull(ywContractBill.getCompanyId())
                || Objects.isNull(ywContractBill.getStartDate())
                || Objects.isNull(ywContractBill.getEndDate())
                || com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywContractBill.getYwContractRoomList())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = ywContractBill.getLoginUserInfo();
        ywContractBill.setReceivableFee(ywContractBill.getTotleFee());
        ywContractBill.setCreateDate(new Date());
        ywContractBill.setCreator(loginUserInfo.getId());
        ywContractBill.setIsdeleted(Constants.ZERO);
@@ -95,7 +94,7 @@
                multifile.setCreator(loginUserInfo.getId());
                multifile.setCreateDate(new Date());
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
                multifile.setObjType(Constants.MultiFile.FN_CONTRACT_BILL_FILE.getKey());
                multifile.setObjId(ywContractBill.getId());
            }
            multifileMapper.insert(ywContractBill.getMultifileList());
@@ -160,9 +159,26 @@
        IPage<YwContractBill> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<YwContractBill> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());

        YwContractBill model = pageWrap.getModel();

        ywContractBillMapper.selectJoinPage(page,YwContractBill.class,
        queryWrapper.selectAll(YwContractBill.class)
                    .selectAs(YwContract::getCode,YwContractBill::getContractCode)
                    .selectAs(YwCustomer::getName,YwContractBill::getCustomerName)
                .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
                .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
                    .eq(YwContractBill::getIsdeleted,Constants.ZERO)
                    .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerName()),
                            YwCustomer::getName,model.getCustomerName())
                    .eq(Objects.nonNull(model)&&Objects.nonNull(model.getStatus()),
                            YwContractBill::getStatus,model.getStatus())
                    .eq(Objects.nonNull(model)&&Objects.nonNull(model.getPayStatus()),
                            YwContractBill::getPayStatus,model.getPayStatus())
                    .eq(Objects.nonNull(model)&&Objects.nonNull(model.getType()),
                            YwContractBill::getType,model.getType())
                .ge(YwContractBill::getPlanPayDate, Utils.Date.getStart(model.getPlanPayDateStart()))
                .le(YwContractBill::getPlanPayDate, Utils.Date.getEnd(model.getPlanPayDateEnd())) )
        ;

        return PageData.from(ywContractBillMapper.selectPage(page, queryWrapper));