diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 261588e8..0a762c40 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -5,6 +5,7 @@ import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.model.request.CopyForMeRequest; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; import com.daqing.financial.guarantee.model.request.PersonalEfficiencyListRequest; +import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; import com.daqing.financial.guarantee.model.response.CopyForMeResponse; import com.daqing.financial.guarantee.model.response.NumResponse; import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; @@ -293,13 +294,29 @@ public class DgEfficiencyController { employeeMessage = (List) responseResult.getData(); } - for (PersonalEfficiencyListResponse response : responseList) { - for (LinkedHashMap res : employeeMessage) { - if (response.getApplicantId().equals(res.get("id"))) {//如果提单人id相同情况下,就往对象里面赋值 - response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"", "")); + if(employeeMessage!= null && employeeMessage.size()>0){ + for (PersonalEfficiencyListResponse response : responseList) { + for (LinkedHashMap res : employeeMessage) { + if (response.getApplicantId().equals(res.get("id"))) {//如果提单人id相同情况下,就往对象里面赋值 + response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"", "")); + } + if(response != null){ + if(response.getApplicant()==null){ + response.setApplicant("客户"); + } + } + } + } + }else{ + for (PersonalEfficiencyListResponse response:responseList) { + if(response != null){ + if(response.getApplicant()==null){ + response.setApplicant("客户"); + } } } } + } try { EasyExcelUtil.download(httpServletResponse, PersonalEfficiencyListResponse.class, responseList, "个人效率记录列表", "第一页"); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java index 78f8d878..29847bb2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java @@ -77,6 +77,6 @@ public class DgStatisticsController { Boolean result = iDgStatisticsService.excelExportRefuse(response); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(70001,"导出数据为空!"); } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java index 2ab75553..007dbba8 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java @@ -120,49 +120,49 @@ public class DgStatisticsServiceImpl extends ServiceImpl list = this.getBaseMapper().list(new Page(), new DgStatisticsRequest()); List dgStatisticsPOList = list.getRecords(); - if (dgStatisticsPOList == null) { - return false; - } - Integer[] presenterIds = dgStatisticsPOList.stream().map(DgStatisticsPO::getPresenterId).toArray(Integer[]::new); - if (presenterIds.length != 0) { - // 强制类型转换 - Long[] ids = new Long[presenterIds.length]; - for (int i = 0; i < presenterIds.length; i++) { - ids[i] = presenterIds[i].longValue(); - } - //ResponseResult> empAndDeptList = hrmsFeignService.getEmployeeAndDeptById(ids); - ResponseResult> empAndDeptList = hrmsFeignService.getAccountAndDeptNameByIds(ids); - if (empAndDeptList.getData() != null) { - List listResponse = this.jointStatistics(dgStatisticsPOList, empAndDeptList.getData()); - List excelResponse = new ArrayList<>(); - for (DgStatisticsListResponse dgStatisticsListResponse : listResponse) { - DgStatisticsExcelResponse dgStatisticsExcelResponse = new DgStatisticsExcelResponse(); - StringBuilder stringBuilder = new StringBuilder(); - if (dgStatisticsListResponse.getDepartment() != null && dgStatisticsListResponse.getDepartment().size() != 0) { - for (int i = 0; i < dgStatisticsListResponse.getDepartment().size(); i++) { - if (i == dgStatisticsListResponse.getDepartment().size() - 1) { - stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)); - } else { - stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)).append(","); + List excelResponse = new ArrayList<>(); + if (dgStatisticsPOList.size()>0) { + Integer[] presenterIds = dgStatisticsPOList.stream().map(DgStatisticsPO::getPresenterId).toArray(Integer[]::new); + if (presenterIds.length != 0) { + // 强制类型转换 + Long[] ids = new Long[presenterIds.length]; + for (int i = 0; i < presenterIds.length; i++) { + ids[i] = presenterIds[i].longValue(); + } + //ResponseResult> empAndDeptList = hrmsFeignService.getEmployeeAndDeptById(ids); + ResponseResult> empAndDeptList = hrmsFeignService.getAccountAndDeptNameByIds(ids); + if (empAndDeptList.getData() != null) { + List listResponse = this.jointStatistics(dgStatisticsPOList, empAndDeptList.getData()); + + for (DgStatisticsListResponse dgStatisticsListResponse : listResponse) { + DgStatisticsExcelResponse dgStatisticsExcelResponse = new DgStatisticsExcelResponse(); + StringBuilder stringBuilder = new StringBuilder(); + if (dgStatisticsListResponse.getDepartment() != null && dgStatisticsListResponse.getDepartment().size() != 0) { + for (int i = 0; i < dgStatisticsListResponse.getDepartment().size(); i++) { + if (i == dgStatisticsListResponse.getDepartment().size() - 1) { + stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)); + } else { + stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)).append(","); + } } } + dgStatisticsExcelResponse.setDepartment(stringBuilder.toString()); + BeanUtils.copyProperties(dgStatisticsListResponse, dgStatisticsExcelResponse); + excelResponse.add(dgStatisticsExcelResponse); } - dgStatisticsExcelResponse.setDepartment(stringBuilder.toString()); - BeanUtils.copyProperties(dgStatisticsListResponse, dgStatisticsExcelResponse); - excelResponse.add(dgStatisticsExcelResponse); - } - try { - ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计信息一览表", "statistics", new DgStatisticsExcelResponse()) - .finish(); - } catch (Exception e) { - ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); + } - return true; - } else { - return false; } } - return false; + try { + ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计信息一览表", "statistics", new DgStatisticsExcelResponse()) + .finish(); + return true; + } catch (Exception e) { + ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); + return false; + } + } /** @@ -263,47 +263,48 @@ public class DgStatisticsServiceImpl extends ServiceImpl listRefuse = this.getBaseMapper().listRefuse(new Page(), new DgStatisticsRequest()); List statisticsRefusePOList = listRefuse.getRecords(); - if (statisticsRefusePOList == null) { - return false; - } - Integer[] presenterIds = statisticsRefusePOList.stream().map(DgStatisticsRefusePO::getPresenterId).toArray(Integer[]::new); - if (presenterIds.length != 0) { - // 强制类型转换 - Long[] ids = new Long[presenterIds.length]; - for (int i = 0; i < presenterIds.length; i++) { - ids[i] = presenterIds[i].longValue(); - } - //ResponseResult> empAndDeptList = hrmsFeignService.getEmployeeAndDeptById(ids); - ResponseResult> empAndDeptList = hrmsFeignService.getAccountAndDeptNameByIds(ids); - if (empAndDeptList.getData() != null) { - // 提单人姓名、部门拼装 - List listResponse = this.jointRefuseStatistics(statisticsRefusePOList, empAndDeptList.getData()); - List excelResponse = new ArrayList<>(); - for (DgStatisticsListRefuseResponse listRefuseResponse : listResponse) { - DgStatisticsExcelRefuseResponse excelRefuseResponse = new DgStatisticsExcelRefuseResponse(); - StringBuilder stringBuilder = new StringBuilder(); - if (listRefuseResponse.getDepartment() != null && listRefuseResponse.getDepartment().size() != 0) { - for (int i = 0; i < listRefuseResponse.getDepartment().size(); i++) { - if (i == listRefuseResponse.getDepartment().size() - 1) { - stringBuilder.append(listRefuseResponse.getDepartment().get(i)); - } else { - stringBuilder.append(listRefuseResponse.getDepartment().get(i)).append(","); + List excelResponse = new ArrayList<>(); + if (statisticsRefusePOList.size()>0) { + + Integer[] presenterIds = statisticsRefusePOList.stream().map(DgStatisticsRefusePO::getPresenterId).toArray(Integer[]::new); + if (presenterIds.length != 0) { + // 强制类型转换 + Long[] ids = new Long[presenterIds.length]; + for (int i = 0; i < presenterIds.length; i++) { + ids[i] = presenterIds[i].longValue(); + } + //ResponseResult> empAndDeptList = hrmsFeignService.getEmployeeAndDeptById(ids); + ResponseResult> empAndDeptList = hrmsFeignService.getAccountAndDeptNameByIds(ids); + if (empAndDeptList.getData() != null) { + // 提单人姓名、部门拼装 + List listResponse = this.jointRefuseStatistics(statisticsRefusePOList, empAndDeptList.getData()); + + for (DgStatisticsListRefuseResponse listRefuseResponse : listResponse) { + DgStatisticsExcelRefuseResponse excelRefuseResponse = new DgStatisticsExcelRefuseResponse(); + StringBuilder stringBuilder = new StringBuilder(); + if (listRefuseResponse.getDepartment() != null && listRefuseResponse.getDepartment().size() != 0) { + for (int i = 0; i < listRefuseResponse.getDepartment().size(); i++) { + if (i == listRefuseResponse.getDepartment().size() - 1) { + stringBuilder.append(listRefuseResponse.getDepartment().get(i)); + } else { + stringBuilder.append(listRefuseResponse.getDepartment().get(i)).append(","); + } } } + excelRefuseResponse.setDepartment(stringBuilder.toString()); + BeanUtils.copyProperties(listRefuseResponse, excelRefuseResponse); + excelResponse.add(excelRefuseResponse); } - excelRefuseResponse.setDepartment(stringBuilder.toString()); - BeanUtils.copyProperties(listRefuseResponse, excelRefuseResponse); - excelResponse.add(excelRefuseResponse); - } - try { - ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsExcelRefuseResponse()) - .finish(); - } catch (Exception e) { - ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); + } } - return false; - } else { + } + try { + ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsExcelRefuseResponse()) + .finish(); + return true; + } catch (Exception e) { + ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); return false; } }