From afe3952e5fbf565cba6a2e4da82eec89f383fd4c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 一月 2024 22:20:17 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/export/adapt/ReportFeeSummaryAdapt.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeSummaryAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeSummaryAdapt.java
index 479d937..cc4f992 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeSummaryAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeSummaryAdapt.java
@@ -40,9 +40,12 @@
row.createCell(1).setCellValue("鏀惰垂鎴�");
row.createCell(2).setCellValue("娆犺垂鎴�");
row.createCell(3).setCellValue("鍘嗗彶娆犺垂+褰撴湡娆犺垂=娆犺垂");
- row.createCell(6).setCellValue("娆犺垂杩藉洖+褰撴湡瀹炴敹+棰勪氦=瀹炴敹");
- row.createCell(10).setCellValue("宸蹭氦鎴�/鏀惰垂鎴�=鎴锋敹璐圭巼");
- row.createCell(11).setCellValue("(瀹炴敹-棰勪氦)/(鍘嗗彶娆犺垂+褰撴湡搴旀敹)=鏀惰垂鐜�");
+ row.createCell(6).setCellValue("娆犺垂杩藉洖+褰撴湡閮ㄥ垎+棰勪氦=瀹炵即");
+ row.createCell(10).setCellValue("褰撴湡搴旀敹");
+ row.createCell(11).setCellValue("褰撴湡瀹炴敹");
+ row.createCell(12).setCellValue("宸蹭氦鎴�/鏀惰垂鎴�=鎴锋敹璐圭巼");
+ row.createCell(13).setCellValue("褰撴湡瀹炴敹/褰撴湡搴旀敹=鏀惰垂鐜�");
+ row.createCell(14).setCellValue("娆犺垂杩藉洖/(娆犺垂杩藉洖+鍘嗗彶娆犺垂)=娓呯即鐜�");
JSONObject reqJson = exportDataDto.getReqJson();
@@ -93,23 +96,33 @@
row.createCell(8).setCellValue(dataObj.getDouble("preReceivedFee"));
row.createCell(9).setCellValue(dataObj.getDouble("receivedFee"));
//((fee.feeRoomCount-fee.oweRoomCount)/fee.feeRoomCount*100).toFixed(2)
+ row.createCell(10).setCellValue(dataObj.getDouble("curReceivableFee"));
+ BigDecimal curReceivableFee = new BigDecimal(dataObj.getDouble("curReceivableFee"));
+ BigDecimal curReceivedFee = curReceivableFee.subtract(curOweFee);
+ row.createCell(11).setCellValue(curReceivedFee.doubleValue());
+ //todo 璁＄畻鎴锋敹璐圭巼
BigDecimal feeRoomCount = new BigDecimal(dataObj.getDouble("feeRoomCount"));
BigDecimal oweRoomCount = new BigDecimal(dataObj.getDouble("oweRoomCount"));
BigDecimal roomFeeRate = new BigDecimal(0);
- if(feeRoomCount.doubleValue()>0){
- feeRoomCount.subtract(oweRoomCount).divide(feeRoomCount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (feeRoomCount.doubleValue() > 0) {
+ roomFeeRate = feeRoomCount.subtract(oweRoomCount).divide(feeRoomCount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
}
- row.createCell(10).setCellValue(roomFeeRate.doubleValue() + "%");
- //((fee.receivedFee-fee.preReceivedFee)/(fee.hisOweFee+fee.curReceivableFee)*100).toFixed(2)
- BigDecimal curReceivableFee = new BigDecimal(dataObj.getDouble("curReceivableFee"));
- curReceivableFee = hisOweFee.add(curReceivableFee);
- roomFeeRate = new BigDecimal(0);
- if(curReceivableFee.doubleValue()> 0) {
- roomFeeRate = receivedFee.subtract(preReceivedFee).divide(curReceivableFee, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
- }
- row.createCell(11).setCellValue(roomFeeRate.doubleValue() + "%");
+ row.createCell(12).setCellValue(roomFeeRate.doubleValue() + "%");
+ //todo 璁＄畻鏀惰垂鐜� 褰撴湡瀹炴敹/褰撴湡搴旀敹=鏀惰垂鐜�
+ roomFeeRate = new BigDecimal(0);
+ if (curReceivableFee.doubleValue() > 0) {
+ roomFeeRate = curReceivedFee.divide(curReceivableFee, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ }
+ //todo 璁＄畻娓呯即鐜� 娆犺垂杩藉洖/(娆犺垂杩藉洖+鍘嗗彶娆犺垂)=娓呯即鐜�
+ row.createCell(13).setCellValue(roomFeeRate.doubleValue() + "%");
+ hisReceivedFee = hisReceivedFee.add(hisOweFee);
+ roomFeeRate = new BigDecimal(0);
+ if (hisReceivedFee.doubleValue() > 0) {
+ roomFeeRate = hisReceivedFee.divide(hisReceivedFee, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ }
+ row.createCell(14).setCellValue(roomFeeRate.doubleValue() + "%");
}
/**
--
Gitblit v1.8.0