优化代码

wuxw

2023-11-01 7fca0ff445f4c19d547daf71b47201505cb2b9c0

 service-job/src/main/java/com/java110/job/export/adapt/ReportFeeDetailRoomAdapt.java

@@ -2,16 +2,14 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.Dict.DictDto;
import com.java110.dto.FloorDto;
import com.java110.dto.RoomDto;
import com.java110.dto.dict.DictDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.data.ExportDataDto;
import com.java110.dto.report.QueryStatisticsDto;
import com.java110.intf.dev.IDictV1InnerServiceSMO;
import com.java110.intf.report.IBaseDataStatisticsInnerServiceSMO;
import com.java110.intf.report.IReportFeeStatisticsInnerServiceSMO;
import com.java110.job.export.IExportDataAdapt;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -89,10 +87,9 @@
        queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));
        queryStatisticsDto.setOwnerName(reqJson.getString("ownerName"));
        queryStatisticsDto.setLink(reqJson.getString("link"));
        queryStatisticsDto.setPage(reqJson.getInteger("page"));
        queryStatisticsDto.setRow(reqJson.getInteger("row"));
        //todo 查询记录数
        long count = getRoomCount(queryStatisticsDto);

        List<RoomDto> rooms = null;
        for(int page = 1;page <= count; page++){
            queryStatisticsDto.setPage(page);
@@ -121,11 +118,11 @@
            row.createCell(3).setCellValue(dataObj.getString("receivedFee"));

            for(int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
                oweFee = dataObj.getString("oweFee"+dictDtos.get(0).getStatusCd());
                oweFee = dataObj.getString("oweFee"+dictDtos.get(dictIndex).getStatusCd());
                if(StringUtil.isEmpty(oweFee)){
                    oweFee = "0";
                }
                receivedFee = dataObj.getString("receivedFee"+dictDtos.get(0).getStatusCd());
                receivedFee = dataObj.getString("receivedFee"+dictDtos.get(dictIndex).getStatusCd());
                if(StringUtil.isEmpty(receivedFee)){
                    receivedFee = "0";
                }
@@ -220,9 +217,11 @@
            return datas;
        }

        BigDecimal oweFee = new BigDecimal(0.00);
        BigDecimal receivedFee = new BigDecimal(0.00);
        BigDecimal oweFee = null;
        BigDecimal receivedFee = null;
        for(int dataIndex = 0; dataIndex < datas.size();dataIndex ++){
            oweFee = new BigDecimal(0.00);
            receivedFee = new BigDecimal(0.00);
            data = datas.getJSONObject(dataIndex);
            for(Map info : infos){
                if(!data.get("roomId").toString().equals(info.get("objId"))){
@@ -230,7 +229,7 @@
                }

                oweFee = oweFee.add(new BigDecimal(info.get("oweFee").toString()));
                receivedFee = oweFee.add(new BigDecimal(info.get("receivedFee").toString()));
                receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
                data.put("oweFee"+info.get("feeTypeCd").toString(),info.get("oweFee"));
                data.put("receivedFee"+info.get("feeTypeCd").toString(),info.get("receivedFee"));
            }
@@ -240,4 +239,6 @@

        return datas;
    }


}