From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期三, 23 四月 2025 17:30:52 +0800 Subject: [PATCH] 巡检任务 设备维修新增是否生成工单 --- platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java index 07ac4df..c3092ea 100644 --- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java +++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java @@ -57,6 +57,7 @@ wrapper.eq(contract.getType()!=null,Contract::getType,contract.getType()); wrapper.like(StringUtils.isNotEmpty(contract.getName()),Contract::getName,contract.getName()); wrapper.like(StringUtils.isNotEmpty(contract.getNumber()),Contract::getNumber,contract.getNumber()); + wrapper.orderByDesc(Contract::getCreateTime); return R.ok(contractService.page(page, wrapper)); } @@ -132,6 +133,7 @@ * @param id id * @return R */ + @SysLog("瀹℃壒閫氳繃鍚堝悓" ) @Operation(summary = "瀹℃壒閫氳繃鍚堝悓" , description = "瀹℃壒閫氳繃鍚堝悓" ) @GetMapping("/approved/{id}" ) public R approved(@PathVariable("id" ) Long id) { @@ -148,4 +150,29 @@ return R.ok(contractService.getApprovedContractList()); } + /** + * 鍚堝悓鐢宠浣滃簾 + * @param id id + * @return R + */ + @SysLog("鍚堝悓鐢宠浣滃簾" ) + @Operation(summary = "鍚堝悓鐢宠浣滃簾" , description = "鍚堝悓鐢宠浣滃簾" ) + @GetMapping("/approvelInvalid/{id}" ) + @PreAuthorize("@pms.hasPermission('platformx_contract_zfsq')") + public R approvelInvalid(@PathVariable("id" ) Long id) { + return contractService.approvelInvalid(id); + } + + /** + * 鍚堝悓鐢宠浣滃簾 + * @param id id + * @return R + */ + @SysLog("鍚堝悓浣滃簾" ) + @Operation(summary = "鍚堝悓浣滃簾" , description = "鍚堝悓浣滃簾" ) + @GetMapping("/invalidById/{id}" ) + @PreAuthorize("@pms.hasPermission('platformx_contract_zf')") + public R invalidById(@PathVariable("id" ) Long id) { + return contractService.invalidById(id); + } } -- Gitblit v1.9.1