优化报表支持按时间段

wuxw

2025-02-05 979ddae1450771e1546e7adca7ad9916f51215be

 service-report/src/main/java/com/java110/report/smo/impl/ReportFeeStatisticsInnerServiceSMOImpl.java

@@ -7,10 +7,13 @@
import com.java110.intf.report.IReportFeeStatisticsInnerServiceSMO;
import com.java110.report.dao.IReportFeeStatisticsServiceDao;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ListUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -257,6 +260,23 @@
    @Override
    public List<Map> getObjOweFee(@RequestBody QueryStatisticsDto queryStatisticsDto) {
        List<Map> infos = reportFeeStatisticsServiceDaoImpl.getObjOweFee(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
        if(ListUtil.isNull(infos)){
            return infos;
        }
        //  t.fee_type_cd feeTypeCd,t.obj_id payerObjId,t.fee_name feeName,
        //        min(t.cur_month_time) endTime,max(t.cur_month_time) deadlineTime,max(t.deadline_time) maxDeadLineTime
        //        sum(t.receivable_amount) amountOwed
        for(Map info : infos){
            Date deadlineTime = (Date) info.get("deadlineTime");
            Date endTime = (Date) info.get("endTime");
            deadlineTime = DateUtil.getPreSecTime(deadlineTime,1);
            Date maxDeadLineTime = (Date) info.get("maxDeadLineTime");
            if(deadlineTime.getTime() > maxDeadLineTime.getTime()){
                deadlineTime = maxDeadLineTime;
            }
            info.put("deadlineTime",DateUtil.getFormatTimeStringB(deadlineTime));
            info.put("endTime",DateUtil.getFormatTimeStringB(endTime));
        }
        return infos;
    }