diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index e7ba8ed..8a6d440 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -54,12 +54,12 @@ public Object listPage(String keywords, String pipelineType, String deptid,String material, String pipeDiameter1,String pipeDiameter2, - String begTime,String endTime) { + String beginTime,String endTime) { Page page = PageFactory.defaultPage(); //查询数据权限 使用默认deptid 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid, - material,pipeDiameter1,pipeDiameter2,begTime,endTime); + material,pipeDiameter1,pipeDiameter2,beginTime,endTime); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } @@ -174,10 +174,10 @@ @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid,String material, String pipeDiameter1,String pipeDiameter2, - String begTime,String endTime) throws IOException { + String beginTime,String endTime) throws IOException { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords,material,pipeDiameter1, - pipeDiameter2,begTime,endTime); + pipeDiameter2,beginTime,endTime); list.forEach(batchExportDataDto -> { batchExportDataDto.setPipelineTypeName(dictService.getDictNameByCode(BusWellConst.PIPELINE_TYPE, batchExportDataDto.getPipelineType())); batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptid())));