java110
2020-09-29 074297ccf3c132231075e505238ae68b64153e44
service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java
@@ -9,11 +9,13 @@
import com.java110.intf.IFeeManualCollectionDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeManualCollectionInnerServiceSMO;
import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
@Service("getCollectionBMOImpl")
@@ -82,6 +84,7 @@
        dataObj.put("联系电话", tmpFeeManualCollectionDto.getLink());
        dataObj.put("收费面积/m2", tmpFeeManualCollectionDto.getRoomArea());
        BigDecimal totalFee = new BigDecimal(0);
        for (FeeConfigDto feeConfigDto : feeConfigDtos) {
@@ -93,11 +96,18 @@
                continue;
            }
            BigDecimal amount = new BigDecimal(tmpFeeManualCollectionDetailDto.getAmount());
            totalFee = totalFee.add(amount);
            dataObj.put(feeConfigDto.getFeeName(), tmpFeeManualCollectionDetailDto.getAmount());
            dataObj.put(feeConfigDto.getFeeName() + "_起止日期",
                    tmpFeeManualCollectionDetailDto.getStartTime() + "至" + tmpFeeManualCollectionDetailDto.getEndTime());
                    DateUtil.dateTimeToDate(tmpFeeManualCollectionDetailDto.getStartTime())
                            + "至" + DateUtil.dateTimeToDate(tmpFeeManualCollectionDetailDto.getEndTime()));
        }
        dataObj.put("应交款总额", totalFee.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
        data.add(dataObj);
    }