|
@@ -168,6 +168,23 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if(record.getStatusSearchType() != null){
|
|
|
+ List<Integer> statusList = new ArrayList<>();
|
|
|
+ if(record.getStatusSearchType() == 1){ // 待维修
|
|
|
+ statusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
|
|
|
+ statusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
|
|
|
+ }
|
|
|
+ if(record.getStatusSearchType() == 2){ // 待审核
|
|
|
+ statusList.add(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
|
|
|
+ statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
|
|
|
+ }
|
|
|
+ if(record.getStatusSearchType() == 3){ // 已完成
|
|
|
+ statusList.add(RepairApplicationFormStatusEnum.FINISHED.getValue());
|
|
|
+ }
|
|
|
+ if(record.getStatusSearchType() == 4){ // 已驳回
|
|
|
+ statusList.add(RepairApplicationFormStatusEnum.REBACK.getValue());
|
|
|
+ }
|
|
|
+ }
|
|
|
return new MyVOPage<>(mapper.selectPageList(record));
|
|
|
}
|
|
|
|
|
@@ -872,8 +889,17 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
}
|
|
|
}
|
|
|
// 统计总和数据
|
|
|
- vo.setTotalFee(vo.getRepairFee().add(vo.getOutRepairFee()));
|
|
|
- vo.setTotalNum(vo.getRepairTotalNum().add(vo.getOutRepairTotalNum()));
|
|
|
+ queryDTO.setType(null);
|
|
|
+ queryDTO.setSearchTime(null);
|
|
|
+ int year = LocalDateTime.now().getYear();
|
|
|
+ int month = LocalDateTime.now().getMonthValue();
|
|
|
+ queryDTO.setSearchStartTime(DateUtils.getFirstDayOfMonth(year, month));
|
|
|
+ queryDTO.setSearchEndTime(DateUtils.getLastDayOfMonth(year, month));
|
|
|
+ RepairApplicationFormVO voInfo = mapper.getWorkplaceRepairSumData(queryDTO);
|
|
|
+ if(voInfo != null){
|
|
|
+ vo.setTotalFee(voInfo.getTempTotalFee());
|
|
|
+ vo.setTotalNum(vo.getTotalNum());
|
|
|
+ }
|
|
|
return vo;
|
|
|
}
|
|
|
|