diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index 9a417c0f..9523967a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -280,11 +280,11 @@ public class SltAgreementInfoController extends BaseController { @ApiOperation(value = "导出结算信息列表") @PreventRepeatSubmit @RequiresPermissions("settlement:info:export") - @SysLog(title = "结算信息", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出结算信息") + @SysLog(title = "结算信息", businessType = OperaType.EXPORT, module = "仓储管理->导出结算信息") @PostMapping("/export") public void export(HttpServletResponse response, SltAgreementInfo sltAgreementInfo) { List list = sltAgreementInfoService.selectSltAgreementInfoList(sltAgreementInfo); - ExcelUtil util = new ExcelUtil(SltAgreementInfo.class); + ExcelUtil util = new ExcelUtil<>(SltAgreementInfo.class); util.exportExcel(response, list, "结算信息数据"); } @@ -296,14 +296,11 @@ public class SltAgreementInfoController extends BaseController { * @throws Exception */ - private void expOutExcel(HttpServletResponse response, List list, String filename,String projectName,String unitName,BigDecimal totalCost,int type) - throws Exception { + private void expOutExcel(HttpServletResponse response, List list, String filename,String projectName,String unitName,BigDecimal totalCost,int type) throws Exception { if (list != null) { - List> results = new ArrayList>(); - int size = list.size(); - for (int i = 0; i < size; i++) { - SltLeaseInfo bean = list.get(i); - Map maps = outReceiveDetailsBeanToMap(bean,type,0); + List> results = new ArrayList<>(); + for (SltLeaseInfo bean : list) { + Map maps = outReceiveDetailsBeanToMap(bean, type, 0); results.add(maps); } List headers = receiveDetailsHeader(type,0); @@ -318,13 +315,12 @@ public class SltAgreementInfoController extends BaseController { out.flush(); out.close(); }else{ - List> results = new ArrayList>(); + List> results = new ArrayList<>(); List headers = receiveDetailsHeader(type,0); HSSFWorkbook workbook = PoiOutPage.excel(results, headers, filename); OutputStream out = null; response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - response.addHeader("Content-Disposition", - "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); + response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); response.setHeader("Pragma", "No-cache"); out = response.getOutputStream(); workbook.write(out); @@ -347,42 +343,36 @@ public class SltAgreementInfoController extends BaseController { List> resultsScrap = new ArrayList<>(); List> resultsReduction = new ArrayList<>(); if (lease!= null) { - int sizeLease = lease.size(); for (SltLeaseInfo bean : lease) { Map maps = outReceiveDetailsBeanToMap(bean, 1, 1); resultsLease.add(maps); } } if (lose!= null) { - int sizeLose = lose.size(); for (SltLeaseInfo bean : lose) { Map maps = outReceiveDetailsBeanToMap(bean, 2, 1); resultsLose.add(maps); } } if (repair!= null) { - int sizeRepair = repair.size(); for (SltLeaseInfo bean : repair) { Map maps = outReceiveDetailsBeanToMap(bean, 3, 1); resultsRepair.add(maps); } } if (scrap!= null) { - int sizeScrap = scrap.size(); for (SltLeaseInfo bean : scrap) { Map maps = outReceiveDetailsBeanToMap(bean, 4, 1); resultsScrap.add(maps); } } if (reduction!= null) { - int sizeReduction = reduction.size(); for (SltLeaseInfo bean : reduction) { Map maps = outReceiveDetailsBeanToMap(bean, 5, 1); resultsReduction.add(maps); } } - List headersLease = receiveDetailsHeader(1,1); List headersLose = receiveDetailsHeader(2,1); List headersRepair = receiveDetailsHeader(3,1); @@ -408,50 +398,39 @@ public class SltAgreementInfoController extends BaseController { private void expOutExcelAlls(HttpServletResponse response, List lease,List lose,List repair,List scrap,List reduction, String filename,String projectName,String unitName,BigDecimal totalCostLease,BigDecimal totalCostLose,BigDecimal totalCostRepair,BigDecimal totalCostScrap,BigDecimal totalCostReduction) throws Exception { - List> resultsLease = new ArrayList>(); - List> resultsLose = new ArrayList>(); - List> resultsRepair = new ArrayList>(); - List> resultsScrap = new ArrayList>(); - List> resultsReduction = new ArrayList>(); + List> resultsLease = new ArrayList<>(); + List> resultsLose = new ArrayList<>(); + List> resultsRepair = new ArrayList<>(); + List> resultsScrap = new ArrayList<>(); + List> resultsReduction = new ArrayList<>(); if (lease!= null) { - int sizeLease = lease.size(); - for (int i = 0; i < sizeLease; i++) { - SltLeaseInfo bean = lease.get(i); - Map maps = outReceiveDetailsBeanToMap(bean,1,1); + for (SltLeaseInfo bean : lease) { + Map maps = outReceiveDetailsBeanToMap(bean, 1, 1); resultsLease.add(maps); } } if (lose!= null) { - int sizeLose = lose.size(); - for (int i = 0; i < sizeLose; i++) { - SltLeaseInfo bean = lose.get(i); - Map maps = outReceiveDetailsBeanToMap(bean,2,1); + for (SltLeaseInfo bean : lose) { + Map maps = outReceiveDetailsBeanToMap(bean, 2, 1); resultsLose.add(maps); } } if (repair!= null) { - int sizeRepair = repair.size(); - for (int i = 0; i < sizeRepair; i++) { - SltLeaseInfo bean = repair.get(i); - Map maps = outReceiveDetailsBeanToMap(bean,3,1); + for (SltLeaseInfo bean : repair) { + Map maps = outReceiveDetailsBeanToMap(bean, 3, 1); resultsRepair.add(maps); } } if (scrap!= null) { - int sizeScrap = scrap.size(); - for (int i = 0; i < sizeScrap; i++) { - SltLeaseInfo bean = scrap.get(i); - Map maps = outReceiveDetailsBeanToMap(bean,4,1); + for (SltLeaseInfo bean : scrap) { + Map maps = outReceiveDetailsBeanToMap(bean, 4, 1); resultsScrap.add(maps); } } - if (reduction!= null) { - int sizeReduction = reduction.size(); - for (int i = 0; i < sizeReduction; i++) { - SltLeaseInfo bean = reduction.get(i); - Map maps = outReceiveDetailsBeanToMap(bean,5,1); + for (SltLeaseInfo bean : reduction) { + Map maps = outReceiveDetailsBeanToMap(bean, 5, 1); resultsReduction.add(maps); } } @@ -464,8 +443,7 @@ public class SltAgreementInfoController extends BaseController { HSSFWorkbook workbook = PoiOutPage.excelForcheckAlls(resultsLease,resultsLose,resultsRepair,resultsScrap,resultsReduction, headersLease,headersLose,headersRepair,headersScrap,headersReduction, filename,projectName,unitName,totalCostLease,totalCostLose,totalCostRepair,totalCostScrap,totalCostReduction); OutputStream out = null; response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - response.addHeader("Content-Disposition", - "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); + response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); response.setHeader("Pragma", "No-cache"); out = response.getOutputStream(); workbook.write(out); @@ -476,13 +454,11 @@ public class SltAgreementInfoController extends BaseController { /** * 租赁费用单数据转换 - * @param bean - * @return */ private Map outReceiveDetailsBeanToMap(SltLeaseInfo bean,int type,int flag) { // 创建一个SimpleDateFormat对象,定义日期格式 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - Map maps = new LinkedHashMap(); + Map maps = new LinkedHashMap<>(); if(type==1){ // maps.put("unitName", bean.getUnitName()); // maps.put("projectName", bean.getProjectName());