java110
2022-04-25 6143e4184fb40e0d40f2d69fd08a7a38ae6a9ca2
优化代码
5个文件已修改
35 ■■■■ 已修改文件
Readme.md 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Readme_en.md 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/reportOwnerPayFee/ReportOwnerPayFeeDto.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Readme.md
@@ -16,8 +16,7 @@
## how to use
[Operation Manual](http://bbs.homecommunity.cn/document.html?docId=102022031484710001)
[Operation Manual](https://github.com/java110/MicroCommunity/wiki)
   
## product
Readme_en.md
@@ -16,7 +16,7 @@
## how to use
[Operation Manual](http://bbs.homecommunity.cn/document.html?docId=102022031484710001)
[Operation Manual](https://github.com/java110/MicroCommunity/wiki)
   
## product
java110-bean/src/main/java/com/java110/dto/reportOwnerPayFee/ReportOwnerPayFeeDto.java
@@ -47,6 +47,9 @@
    private String statusCd = "0";
    private String feeEndTime;
    private List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos;
@@ -276,4 +279,12 @@
    public void setRoomNum(String roomNum) {
        this.roomNum = roomNum;
    }
    public String getFeeEndTime() {
        return feeEndTime;
    }
    public void setFeeEndTime(String feeEndTime) {
        this.feeEndTime = feeEndTime;
    }
}
java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml
@@ -50,7 +50,10 @@
        LEFT JOIN f_floor ff on bu.floor_id = ff.floor_id and ff.status_cd = '0'
        left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
        left join contract con on t.payer_obj_id = con.contract_id and t.payer_obj_type = '7777' and con.status_cd = '0'
        where t.end_time > NOW()
        where 1=1
        <if test="feeEndTime !=null and feeEndTime != ''">
            and t.end_time &gt; #{feeEndTime}
        </if>
        and t.state = '2008001'
        and t.status_cd = '0'
        <if test="configId !=null and configId != ''">
@@ -153,7 +156,10 @@
        LEFT JOIN f_floor ff on bu.floor_id = ff.floor_id and ff.status_cd = '0'
        left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
        left join contract con on t.payer_obj_id = con.contract_id and t.payer_obj_type = '7777' and con.status_cd = '0'
        where t.end_time > NOW()
        where 1=1
        <if test="feeEndTime !=null and feeEndTime != ''">
            and t.end_time &gt; #{feeEndTime}
        </if>
        and t.state = '2008001'
        and t.status_cd = '0'
        <if test="configId !=null and configId != ''">
service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
@Service("getReportOwnerPayFeeBMOImpl")
@@ -26,8 +27,12 @@
     * @return 订单服务能够接受的报文
     */
    public ResponseEntity<String> get(ReportOwnerPayFeeDto reportOwnerPayFeeDto) {
        if(!StringUtil.isEmpty(reportOwnerPayFeeDto.getPfYear())) {
            reportOwnerPayFeeDto.setFeeEndTime(reportOwnerPayFeeDto.getPfYear()+"-01-01");
        }else{
            Calendar calendar =Calendar.getInstance();
            reportOwnerPayFeeDto.setFeeEndTime(calendar.get(Calendar.YEAR)+"-01-01");
        }
        int count = reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerPayFeesCount(reportOwnerPayFeeDto);
        List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos = null;