diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java index 904c33168..8d0b18329 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java @@ -41,14 +41,14 @@ public class BigDevicesMaintenanceRecordController { */ @ApiOperation(value = " 分页列表查询大型设备-维保记录表信息", notes = "分页列表查询大型设备-维保记录表信息", httpMethod="POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "devSn", value = "设备编号", dataType = "String", paramType = "body", required = false), - @ApiImplicitParam(name = "devType", value = "设备类型,1塔吊,2升降机,3龙门吊", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "maintenanceStartTime", value = "维保开始时间", paramType = "body", required = false, dataType = "String"), - @ApiImplicitParam(name = "maintenanceEndTime", value = "维保结束时间", paramType = "body", required = false, dataType = "String"), - }) + @ApiImplicitParam(name = "devSn", value = "设备编号", dataType = "String", paramType = "body", required = false), + @ApiImplicitParam(name = "devType", value = "设备类型,1塔吊,2升降机,3龙门吊", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "maintenanceStartTime", value = "维保开始时间2023-08-18", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "maintenanceEndTime", value = "维保结束时间2023-08-18", paramType = "body", required = false, dataType = "String"), + }) @PostMapping(value = "/list") public Result> queryPageList(@RequestBody Map map) { Result> result = new Result<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml index ee6a8d2bc..667aab370 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml @@ -14,7 +14,7 @@ and a.maintenance_time >= #{param.maintenanceStartTime} - and a.maintenance_time <= #{param.maintenanceEndTime} + and a.maintenance_time <= concat(#{param.maintenanceEndTime},' 23:59:59')