From 24a427846e654ff70973ab7665b357ba709dadd6 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 21 六月 2021 17:13:13 +0800
Subject: [PATCH] 1、优化采购，新增物品退还等细节功能，以及流程审批通知2、优化报修和采购互通3、优化巡检任务
---
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
index e4866c6..7c40263 100755
--- a/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java
@@ -332,7 +332,7 @@
+ "鍗曞厓" + reportFeeMonthStatistics.getRoomNum() + "瀹�");
} else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(reportFeeMonthStatistics.getPayerObjType())) {
reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getCarNum());
- }else{
+ } else {
reportFeeMonthStatistics.setObjName(reportFeeMonthStatistics.getContractCode());
}
@@ -465,6 +465,7 @@
/**
* 鏌ヨ鎶ヨ〃涓撳 缁熻淇℃伅
+ *
* @param reportFeeMonthStatisticsDto
* @return
*/
@@ -508,6 +509,8 @@
int transferOrderNumber = 0;
//娲惧崟鎬绘暟閲�
int dispatchNumber = 0;
+ //宸插洖璁挎�绘暟閲�
+ int returnNumber = 0;
if (count > 0) {
for (RepairUserDto repairUser : repairUsers) {
RepairUserDto repairUserInfo = new RepairUserDto();
@@ -525,6 +528,8 @@
int transferOrderAmount = 0;
//娲惧崟鏁伴噺
int dispatchAmount = 0;
+ //鍥炶鏁伴噺
+ int returnAmount = 0;
for (RepairUserDto repair : repairUserDtoList) {
//澶勭悊涓姸鎬�
if (repair.getState().equals("10001")) {
@@ -546,6 +551,9 @@
} else if (repair.getState().equals("10006")) { //娲惧崟鐘舵��
int amount = Integer.parseInt(repair.getAmount());
dispatchAmount = dispatchAmount + amount;
+ } else if (repair.getState().equals("10008")) { //宸插洖璁跨姸鎬�
+ int amount = Integer.parseInt(repair.getAmount());
+ returnAmount = returnAmount + amount;
}
}
//鍛樺伐id
@@ -572,6 +580,10 @@
repairUserInfo.setDispatchAmount(Integer.toString(dispatchAmount));
//娲惧崟鎶ヤ慨鎬绘暟閲�
repairUserInfo.setDispatchNumber(Integer.toString(dispatchNumber));
+ //鍥炶鏁伴噺
+ repairUserInfo.setReturnAmount(Integer.toString(returnAmount));
+ //鍥炶鎬绘暟閲�
+ repairUserInfo.setReturnNumber(Integer.toString(returnNumber));
//鍛樺伐id鍜屽鍚嶄俊鎭泦鍚�
repairUserInfo.setRepairList(staffs);
repairUserList.add(repairUserInfo);
@@ -583,6 +595,7 @@
chargebackNumber = Integer.parseInt(repairUserInfo.getChargebackAmount()) + chargebackNumber;
transferOrderNumber = Integer.parseInt(repairUserInfo.getTransferOrderAmount()) + transferOrderNumber;
dispatchNumber = Integer.parseInt(repairUserInfo.getDispatchAmount()) + dispatchNumber;
+ returnNumber = Integer.parseInt(repairUserInfo.getReturnAmount()) + returnNumber;
}
} else {
repairUserList = new ArrayList<>();
@@ -594,6 +607,7 @@
repairUser.setChargebackNumber(Integer.toString(chargebackNumber));
repairUser.setTransferOrderNumber(Integer.toString(transferOrderNumber));
repairUser.setDispatchNumber(Integer.toString(dispatchNumber));
+ repairUser.setReturnNumber(Integer.toString(returnNumber));
//鑾峰彇鎬绘潯鏁�
int size = staffs.size();
--
Gitblit v1.8.0