|
@@ -116,14 +116,18 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
|
|
|
String sheetName;
|
|
|
if (list != null && list.size() > 0) {
|
|
|
sheetName = "工程维修状态统计";
|
|
|
- String[] titles = {"项目",
|
|
|
+ String[] titles = {
|
|
|
+ "项目",
|
|
|
"维修大类",
|
|
|
"维修小类",
|
|
|
"时间",
|
|
|
"总工单数",
|
|
|
"未完成",
|
|
|
"完成率",
|
|
|
- "耗时h",
|
|
|
+
|
|
|
+ "平均接单耗时(h)",
|
|
|
+ "平均完成耗时(h)",
|
|
|
+ //"耗时h",
|
|
|
"工程人员",
|
|
|
"平均评星",
|
|
|
"待审核",
|
|
@@ -135,14 +139,18 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
|
|
|
"已完成",
|
|
|
"已取消"};
|
|
|
|
|
|
- String[] fieldNames = {"orgName",
|
|
|
+ String[] fieldNames = {
|
|
|
+ "orgName",
|
|
|
"repairTypeName",
|
|
|
"repairTypeDetailName",
|
|
|
"date",
|
|
|
"allBillTotal",
|
|
|
"unfinishedTotal",
|
|
|
"fillRate",
|
|
|
- "jumpingTime",
|
|
|
+
|
|
|
+ "avgBillTime",
|
|
|
+ "avgCompleteTime",
|
|
|
+ //"jumpingTime",
|
|
|
"managerTotal",
|
|
|
"ki",
|
|
|
"billStatus1Total",
|
|
@@ -249,7 +257,7 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
|
|
|
}
|
|
|
|
|
|
//已抢单-数量
|
|
|
- if(null != dto.getSingleTime()){
|
|
|
+ if(null != repairBill.getSingleTime()){
|
|
|
dto.setBillSingleTotal(dto.getBillSingleTotal() + 1);
|
|
|
singleMinutes += DateHelper.getMinutesBetween(repairBill.getCreateTime(), repairBill.getSingleTime());
|
|
|
}
|
|
@@ -312,8 +320,12 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
|
|
|
//平均接单耗时 -1
|
|
|
if(dto.getBillSingleTotal() > 0){
|
|
|
|
|
|
- BigDecimal avgBillTime = new BigDecimal(dto.getBillSingleTotal()).divide(new BigDecimal(60))
|
|
|
- .divide(new BigDecimal(singleMinutes),2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ LOG.info("===>singleMinutes:{}"+ singleMinutes);
|
|
|
+ LOG.info("===>billSingleTotal:{}"+ dto.getBillSingleTotal());
|
|
|
+
|
|
|
+ BigDecimal avgBillTime =new BigDecimal(singleMinutes).
|
|
|
+ divide(new BigDecimal("60"),2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(dto.getBillSingleTotal()),2, BigDecimal.ROUND_HALF_UP);
|
|
|
+
|
|
|
|
|
|
dto.setAvgBillTime(avgBillTime);
|
|
|
}else{
|
|
@@ -323,8 +335,11 @@ public class RepairBillStatisticsManagerImpl implements RepairBillStatisticsMana
|
|
|
//平均完成耗时 -2
|
|
|
if(dto.getBillStatus8Total() > 0){
|
|
|
|
|
|
+ LOG.info("===>completedMinutes:{}"+ completedMinutes);
|
|
|
+ LOG.info("===>billStatus8Total:{}"+ dto.getBillStatus8Total());
|
|
|
+
|
|
|
BigDecimal avgCompleteTime =new BigDecimal(completedMinutes).
|
|
|
- divide(new BigDecimal(dto.getBillStatus8Total()),2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ divide(new BigDecimal("60"),2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(dto.getBillStatus8Total()),2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
dto.setAvgCompleteTime(avgCompleteTime);
|
|
|
}else{
|