diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index 197f3f7..364dae5 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -34,6 +34,9 @@ import org.energy.modules.leger.vo.EquipmentLedgerVO; import org.energy.modules.leger.service.IEquipmentLedgerService; import com.dayu.daf.core.boot.ctrl.DafController; +import java.util.ArrayList; +import java.util.List; + /** * 设备台账编码一览 控制器 * @@ -66,7 +69,6 @@ public class EquipmentLedgerController extends DafController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入equipmentLedger") public R> list(EquipmentLedger equipmentLedger, Query query) { - query.setAscs("eq_ledger_code"); IPage pages = equipmentLedgerService.page(Condition.getPage(query), Condition.getQueryWrapper(equipmentLedger)); return R.data(pages); } @@ -123,5 +125,37 @@ public class EquipmentLedgerController extends DafController { return R.status(equipmentLedgerService.deleteLogic(Func.toLongList(ids))); } + /** + * 审核 设备台账编码一览 + */ + @PostMapping("/auditing") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "更新", notes = "传入ids") + public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return this.approve(2,ids); + } + /** + * 驳回 设备台账编码一览 + */ + @PostMapping("/reject") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "更新", notes = "传入ids") + public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return this.approve(3,ids); + } + + /** + * 驳回OR审核 设备台账编码一览 + */ + public R approve(Integer status, String ids) { + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + EquipmentLedger equipmentLedger = new EquipmentLedger(); + equipmentLedger.setId(Integer.parseInt(id)); + equipmentLedger.setCheckStatus(status); + list.add(equipmentLedger); + } + return R.status(equipmentLedgerService.updateBatchById(list)); + } }