admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guo 2023-08-01 19:06:16 +08:00
parent 05e6a7b6c2
commit 23a93ac991
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java
View File

@ -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<IPage<BigDevicesMaintenanceRecord>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<BigDevicesMaintenanceRecord>> result = new Result<>();

4
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml
View File

@ -14,7 +14,7 @@
and a.maintenance_time >= #{param.maintenanceStartTime}
</if>
<if test="param.maintenanceEndTime != null and param.maintenanceEndTime != ''">
and a.maintenance_time &lt;= #{param.maintenanceEndTime}
and a.maintenance_time &lt;= concat(#{param.maintenanceEndTime},' 23:59:59')
</if>
</select>
<select id="queryLifterMaintenanceRecordPageList"
@ -29,7 +29,7 @@
and a.maintenance_time >= #{param.maintenanceStartTime}
</if>
<if test="param.maintenanceEndTime != null and param.maintenanceEndTime != ''">
and a.maintenance_time &lt;= #{param.maintenanceEndTime}
and a.maintenance_time &lt;= concat(#{param.maintenanceEndTime},' 23:59:59')
</if>
</select>
<select id="queryGantryCraneMaintenanceRecordPageList"