Your Name
2023-02-26 c43dfd8115a7d81006d687841934dafa52afab26
报表跑数据
3个文件已修改
33 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/report/ReportCarDto.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeMonthStatisticsInnerServiceSMOImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/report/ReportCarDto.java
@@ -37,6 +37,10 @@
    private Date endTime;
    private String leaseType;
    private String[] leaseTypes;
    public String getCarId() {
        return carId;
@@ -189,4 +193,20 @@
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    public String getLeaseType() {
        return leaseType;
    }
    public void setLeaseType(String leaseType) {
        this.leaseType = leaseType;
    }
    public String[] getLeaseTypes() {
        return leaseTypes;
    }
    public void setLeaseTypes(String[] leaseTypes) {
        this.leaseTypes = leaseTypes;
    }
}
java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
@@ -96,6 +96,12 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="leaseTypes !=null ">
            and t.lease_type in
            <foreach collection="leaseTypes" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
@@ -116,6 +122,12 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="leaseTypes !=null ">
            and t.lease_type in
            <foreach collection="leaseTypes" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeMonthStatisticsInnerServiceSMOImpl.java
@@ -167,6 +167,7 @@
        ReportCarDto reportCarDto = new ReportCarDto();
        reportCarDto.setCommunityId(reportFeeMonthStatisticsPo.getCommunityId());
        reportCarDto.setLeaseTypes(new String[]{OwnerCarDto.LEASE_TYPE_MONTH,OwnerCarDto.LEASE_TYPE_INNER,OwnerCarDto.LEASE_TYPE_SALE,OwnerCarDto.LEASE_TYPE_NO_MONEY});
        int count = reportCommunityServiceDaoImpl.getCarCount(reportCarDto);