Skip to content

A
amos-boot-biz
Commit 99583f93 authored by tangwei's avatar tangwei
Browse files
Options

去除追加

parent 16813688
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificAlarmController.java
View file @ 99583f93
...@@ -135,10 +135,10 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController { ...@@ -135,10 +135,10 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
public ResponseModel getAlarmPage(int pageNum, int pageSize, AlarmDTO dto) { public ResponseModel getAlarmPage(int pageNum, int pageSize, AlarmDTO dto) {
dto.setStatus("1"); dto.setStatus("1");
Page page = new Page(pageNum, pageSize); Page page = new Page(pageNum, pageSize);
if (dto.getStartDate() != null && dto.getEndDate() != null){ // if (dto.getStartDate() != null && dto.getEndDate() != null){
dto.setStartDate(dto.getStartDate().split(" ")[0]+" 00:00:00"); // dto.setStartDate(dto.getStartDate().split(" ")[0]+" 00:00:00");
dto.setEndDate(dto.getEndDate().split(" ")[0]+" 23:59:59"); // dto.setEndDate(dto.getEndDate().split(" ")[0]+" 23:59:59");
} // }
Page<EquipSpecificAlarmDTO> pageBean = iEquipmentSpecificAlarmService.getAlarmPage(page, dto); Page<EquipSpecificAlarmDTO> pageBean = iEquipmentSpecificAlarmService.getAlarmPage(page, dto);
return CommonResponseUtil.success(pageBean); return CommonResponseUtil.success(pageBean);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment