diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java index 65aaebe..293f41a 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.database.domain.DevopsVideoStatus; import com.ruoyi.database.domain.DisposalInfo; import com.ruoyi.database.domain.TransitHuntersUserModelRecord; @@ -33,7 +34,8 @@ public class DisposalInfoController extends BaseController { @GetMapping @ApiOperation("查询预警信息处置表") public TableDataInfo list() { - startPage(); + int count = transitHuntersUserModelRecordService.count(); + PageUtils.startPage(); List list1 = transitHuntersUserModelRecordService.list(); ArrayList transitHuntersUserModelRecords = new ArrayList<>(); for (TransitHuntersUserModelRecord transitHuntersUserModelRecord :list1){ @@ -53,22 +55,19 @@ public class DisposalInfoController extends BaseController { } transitHuntersUserModelRecords.add(transitHuntersUserModelRecord); } - return getDataTable(transitHuntersUserModelRecords); + TableDataInfo dataTable = getDataTable(transitHuntersUserModelRecords); + dataTable.setTotal(count); + return dataTable; } @PostMapping @ApiOperation("新增预警信息处置表") @Log(title = "预警信息处置表", businessType = BusinessType.INSERT) public AjaxResult insert(@RequestBody DisposalInfo disposalInfo) { - if (disposalInfo.getDisposalResultCn()!=null){ - boolean equals = "未处置".equals(disposalInfo.getDisposalResultCn()); - if (equals){ - disposalInfo.setDisposalResult(1); - }else { - disposalInfo.setDisposalResult(2); - } + if (disposalInfo != null){ + disposalInfo.setDisposalResult(2); + disposalInfo.setSignStatus(1); } -// if (disposalInfo.getDisposalResultCn()) return toAjax(disposalInfoService.save(disposalInfo)); } @@ -76,6 +75,9 @@ public class DisposalInfoController extends BaseController { @ApiOperation("修改预警信息处置表") @Log(title = "预警信息处置表", businessType = BusinessType.UPDATE) public AjaxResult update(@RequestBody DisposalInfo disposalInfo) { + if (disposalInfo!=null){ + disposalInfo.setSignStatus(2); + } return toAjax(disposalInfoService.updateById(disposalInfo)); } }