1、优化图片异步上传2、bug修复3、合同bug修复4、车场相关问题

xiaogang

2022-09-22 dea2325896c7f8bd7df5107569b71d15fede79c7

 java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java

old mode 100644
new mode 100755
@@ -1,9 +1,11 @@
package com.java110.dto.reportFeeMonthStatistics;

import com.java110.dto.PageDto;
import com.java110.dto.fee.FeeConfigDto;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * @ClassName FloorDto
@@ -20,7 +22,9 @@
    private String updateTime;
    private String remark;
    private String objName;
    private String objNameNum;
    private String receivedAmount;
    private String payableAmount;
    private String feeYear;
    private String feeMonth;
    private String feeId;
@@ -28,8 +32,11 @@
    private String objId;
    private String feeName;
    private String oweAmount;
    private String curOweAmount;
    private String communityId;
    private String feeCreateTime;
    private String feeStartTime;
    private String feeEndTime;
    private String objType;
    private String floorId;
    private String floorNum;
@@ -38,10 +45,16 @@
    private String roomId;
    private String roomNum;
    private String carNum;
    private String psName;
    private String contractCode;
    private String payerObjType;
    private String ownerName;
    private String ownerId;
    private String detailId;
    private String builtUpArea;

    private String objCount;

    private String normalCount;

    private Date createTime;
    private String startTime;
@@ -52,10 +65,84 @@
    private int oweDay;
    private String deadlineTime;

    private String curMaxTime;
    private String importFeeName;

    private String oId;

    //支付方式
    private String primeRate;

    private double configReceivedAmount = 0;

    //应收总金额(小计)
    private String totalReceivableAmount;

    //实收总金额(小计)
    private String totalReceivedAmount;

    //应收总金额(大计)
    private String allReceivableAmount;

    //实收总金额(大计)
    private String allReceivedAmount;

    //实收总金额(大计)
    private String allOweAmount;

    private List<FeeConfigDto> FeeConfigDtos;

    //费用类型
    private String feeTypeCd;

    //费用类型名称
    private String feeTypeCdName;

    //打折金额（包括打折、减免、滞纳金、空置房打折、空置房减免金额等）
    private String discountPrice;

    //1:打折 2:减免 3:滞纳金 4:空置房打折 5:空置房减免
    private String discountSmallType;

    //优惠金额
    private String preferentialAmount;

    //减免金额
    private String deductionAmount;

    //滞纳金
    private String lateFee;

    //空置房打折金额
    private String vacantHousingDiscount;

    //空置房减免金额
    private String vacantHousingReduction;

    //赠送金额
    private String giftAmount;

    //收费率
    private String chargeRate;

    //状态
    private String state;

    //状态名称
    private String stateName;

    private String repairId;

    private double hisOweAmount;
    private double curReceivableAmount;
    private double curReceivedAmount;
    private double hisOweReceivedAmount;
    private double preReceivedAmount;
    private double allHisOweReceivedAmount;

    private String[] configIds;

    private String yearMonth;

    public String getReceivableAmount() {
        return receivableAmount;
@@ -177,6 +264,22 @@
        this.feeCreateTime = feeCreateTime;
    }

    public String getFeeStartTime() {
        return feeStartTime;
    }

    public void setFeeStartTime(String feeStartTime) {
        this.feeStartTime = feeStartTime;
    }

    public String getFeeEndTime() {
        return feeEndTime;
    }

    public void setFeeEndTime(String feeEndTime) {
        this.feeEndTime = feeEndTime;
    }

    public String getObjType() {
        return objType;
    }
@@ -184,7 +287,6 @@
    public void setObjType(String objType) {
        this.objType = objType;
    }


    public Date getCreateTime() {
        return createTime;
@@ -313,4 +415,340 @@
    public void setImportFeeName(String importFeeName) {
        this.importFeeName = importFeeName;
    }

    public String getNormalCount() {
        return normalCount;
    }

    public void setNormalCount(String normalCount) {
        this.normalCount = normalCount;
    }

    public String getTotalReceivableAmount() {
        return totalReceivableAmount;
    }

    public void setTotalReceivableAmount(String totalReceivableAmount) {
        this.totalReceivableAmount = totalReceivableAmount;
    }

    public String getTotalReceivedAmount() {
        return totalReceivedAmount;
    }

    public void setTotalReceivedAmount(String totalReceivedAmount) {
        this.totalReceivedAmount = totalReceivedAmount;
    }

    public String getAllReceivableAmount() {
        return allReceivableAmount;
    }

    public void setAllReceivableAmount(String allReceivableAmount) {
        this.allReceivableAmount = allReceivableAmount;
    }

    public String getAllReceivedAmount() {
        return allReceivedAmount;
    }

    public void setAllReceivedAmount(String allReceivedAmount) {
        this.allReceivedAmount = allReceivedAmount;
    }

    public List<FeeConfigDto> getFeeConfigDtos() {
        return FeeConfigDtos;
    }

    public void setFeeConfigDtos(List<FeeConfigDto> feeConfigDtoS) {
        FeeConfigDtos = feeConfigDtoS;
    }

    public String getPrimeRate() {
        return primeRate;
    }

    public void setPrimeRate(String primeRate) {
        this.primeRate = primeRate;
    }

    public String getFeeTypeCd() {
        return feeTypeCd;
    }

    public void setFeeTypeCd(String feeTypeCd) {
        this.feeTypeCd = feeTypeCd;
    }

    public String getPreferentialAmount() {
        return preferentialAmount;
    }

    public void setPreferentialAmount(String preferentialAmount) {
        this.preferentialAmount = preferentialAmount;
    }

    public String getDeductionAmount() {
        return deductionAmount;
    }

    public void setDeductionAmount(String deductionAmount) {
        this.deductionAmount = deductionAmount;
    }

    public String getLateFee() {
        return lateFee;
    }

    public void setLateFee(String lateFee) {
        this.lateFee = lateFee;
    }

    public String getDiscountSmallType() {
        return discountSmallType;
    }

    public void setDiscountSmallType(String discountSmallType) {
        this.discountSmallType = discountSmallType;
    }

    public String getDiscountPrice() {
        return discountPrice;
    }

    public void setDiscountPrice(String discountPrice) {
        this.discountPrice = discountPrice;
    }

    public String getVacantHousingDiscount() {
        return vacantHousingDiscount;
    }

    public void setVacantHousingDiscount(String vacantHousingDiscount) {
        this.vacantHousingDiscount = vacantHousingDiscount;
    }

    public String getVacantHousingReduction() {
        return vacantHousingReduction;
    }

    public void setVacantHousingReduction(String vacantHousingReduction) {
        this.vacantHousingReduction = vacantHousingReduction;
    }

    public String getContractCode() {
        return contractCode;
    }

    public void setContractCode(String contractCode) {
        this.contractCode = contractCode;
    }

    public String getOwnerName() {
        return ownerName;
    }

    public void setOwnerName(String ownerName) {
        this.ownerName = ownerName;
    }

    public String getoId() {
        return oId;
    }

    public void setoId(String oId) {
        this.oId = oId;
    }

    public String getCurMaxTime() {
        return curMaxTime;
    }

    public void setCurMaxTime(String curMaxTime) {
        this.curMaxTime = curMaxTime;
    }

    public String getChargeRate() {
        return chargeRate;
    }

    public void setChargeRate(String chargeRate) {
        this.chargeRate = chargeRate;
    }

    public String getFeeTypeCdName() {
        return feeTypeCdName;
    }

    public void setFeeTypeCdName(String feeTypeCdName) {
        this.feeTypeCdName = feeTypeCdName;
    }

    public String getState() {
        return state;
    }

    public void setState(String state) {
        this.state = state;
    }

    public String getStateName() {
        return stateName;
    }

    public void setStateName(String stateName) {
        this.stateName = stateName;
    }

    public String getRepairId() {
        return repairId;
    }

    public void setRepairId(String repairId) {
        this.repairId = repairId;
    }

    public String getAllOweAmount() {
        return allOweAmount;
    }

    public void setAllOweAmount(String allOweAmount) {
        this.allOweAmount = allOweAmount;
    }

    public String getCurOweAmount() {
        return curOweAmount;
    }

    public void setCurOweAmount(String curOweAmount) {
        this.curOweAmount = curOweAmount;
    }

    public String getDetailId() {
        return detailId;
    }

    public void setDetailId(String detailId) {
        this.detailId = detailId;
    }

    public String getBuiltUpArea() {
        return builtUpArea;
    }

    public void setBuiltUpArea(String builtUpArea) {
        this.builtUpArea = builtUpArea;
    }

    public String[] getConfigIds() {
        return configIds;
    }

    public void setConfigIds(String[] configIds) {
        this.configIds = configIds;
    }

    public double getConfigReceivedAmount() {
        return configReceivedAmount;
    }

    public void setConfigReceivedAmount(double configReceivedAmount) {
        this.configReceivedAmount = configReceivedAmount;
    }

    public double getHisOweAmount() {
        return hisOweAmount;
    }

    public void setHisOweAmount(double hisOweAmount) {
        this.hisOweAmount = hisOweAmount;
    }

    public double getCurReceivableAmount() {
        return curReceivableAmount;
    }

    public void setCurReceivableAmount(double curReceivableAmount) {
        this.curReceivableAmount = curReceivableAmount;
    }

    public double getCurReceivedAmount() {
        return curReceivedAmount;
    }

    public void setCurReceivedAmount(double curReceivedAmount) {
        this.curReceivedAmount = curReceivedAmount;
    }

    public double getHisOweReceivedAmount() {
        return hisOweReceivedAmount;
    }

    public void setHisOweReceivedAmount(double hisOweReceivedAmount) {
        this.hisOweReceivedAmount = hisOweReceivedAmount;
    }

    public double getPreReceivedAmount() {
        return preReceivedAmount;
    }

    public void setPreReceivedAmount(double preReceivedAmount) {
        this.preReceivedAmount = preReceivedAmount;
    }

    public String getYearMonth() {
        return yearMonth;
    }

    public void setYearMonth(String yearMonth) {
        this.yearMonth = yearMonth;
    }

    public double getAllHisOweReceivedAmount() {
        return allHisOweReceivedAmount;
    }

    public void setAllHisOweReceivedAmount(double allHisOweReceivedAmount) {
        this.allHisOweReceivedAmount = allHisOweReceivedAmount;
    }

    public String getOwnerId() {
        return ownerId;
    }

    public void setOwnerId(String ownerId) {
        this.ownerId = ownerId;
    }

    public String getPsName() {
        return psName;
    }

    public void setPsName(String psName) {
        this.psName = psName;
    }

    public String getObjNameNum() {
        return objNameNum;
    }

    public void setObjNameNum(String objNameNum) {
        this.objNameNum = objNameNum;
    }

    public String getGiftAmount() {
        return giftAmount;
    }

    public void setGiftAmount(String giftAmount) {
        this.giftAmount = giftAmount;
    }

    public String getPayableAmount() {
        return payableAmount;
    }

    public void setPayableAmount(String payableAmount) {
        this.payableAmount = payableAmount;
    }
}