diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index 929cdde..087f9c5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -94,7 +94,7 @@ } @ResponseBody - @ApiOperation("新增下载文件") + @ApiOperation("模板下载") @PostMapping("/downloadFile") public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { if(bindingResult.hasErrors()){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index 929cdde..087f9c5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -94,7 +94,7 @@ } @ResponseBody - @ApiOperation("新增下载文件") + @ApiOperation("模板下载") @PostMapping("/downloadFile") public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { if(bindingResult.hasErrors()){ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 4f67d85..39ef61a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -99,10 +99,10 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - AND bo.require_over_time <= #{request.startTime} + AND bo.require_over_time >= #{request.startTime} - AND bo.require_over_time > #{request.endTime} + AND bo.require_over_time <= #{request.endTime} AND bo.is_urgent = #{request.isUrgent} @@ -137,10 +137,10 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - AND bo.require_over_time <= #{request.startTime} + AND bo.require_over_time >= #{request.startTime} - AND bo.require_over_time > #{request.endTime} + AND bo.require_over_time <= #{request.endTime} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index 929cdde..087f9c5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -94,7 +94,7 @@ } @ResponseBody - @ApiOperation("新增下载文件") + @ApiOperation("模板下载") @PostMapping("/downloadFile") public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { if(bindingResult.hasErrors()){ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 4f67d85..39ef61a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -99,10 +99,10 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - AND bo.require_over_time <= #{request.startTime} + AND bo.require_over_time >= #{request.startTime} - AND bo.require_over_time > #{request.endTime} + AND bo.require_over_time <= #{request.endTime} AND bo.is_urgent = #{request.isUrgent} @@ -137,10 +137,10 @@ AND bo.customer_name LIKE concat('%',#{request.customerName},'%') - AND bo.require_over_time <= #{request.startTime} + AND bo.require_over_time >= #{request.startTime} - AND bo.require_over_time > #{request.endTime} + AND bo.require_over_time <= #{request.endTime} AND bo.is_urgent = #{request.isUrgent} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 8b62146..3e4915c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -52,6 +52,7 @@ Page downloadListResponsePage = PageFactory.defaultPage(); Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(downloadCenterPage.getRecords(), DownloadListResponse.class)); + downloadListResponsePage.setTotal(downloadCenterPage.getTotal()); for (DownloadListResponse customerInfo : downloadListResponsePage.getRecords()) { DictCodeUtils.convertDictCodeToName(customerInfo); }