From ffbddedac17c4a7d18d382c4917b3f375356e061 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期二, 01 四月 2025 10:23:47 +0800 Subject: [PATCH] 整体流程测试修改0401-1 --- platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 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 0b7ce8f..8d8d98c 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)); } @@ -70,7 +71,7 @@ @GetMapping("/{id}" ) @PreAuthorize("@pms.hasPermission('platformx_contract_view')" ) public R getById(@PathVariable("id" ) Long id) { - return R.ok(contractService.getById(id)); + return R.ok(contractService.getDetailById(id)); } /** @@ -84,7 +85,7 @@ @PreAuthorize("@pms.hasPermission('platformx_contract_add')" ) public R save(@RequestBody Contract contract) { contract.setNumber(maxSizeService.nextNo(MaxSizeContant.CONTRACT_NUM)); - return R.ok(contractService.save(contract)); + return R.ok(contractService.saveDeep(contract)); } /** @@ -97,7 +98,7 @@ @PutMapping @PreAuthorize("@pms.hasPermission('platformx_contract_edit')" ) public R updateById(@RequestBody Contract contract) { - return R.ok(contractService.updateById(contract)); + return R.ok(contractService.updateDeep(contract)); } /** @@ -110,7 +111,7 @@ @DeleteMapping @PreAuthorize("@pms.hasPermission('platformx_contract_del')" ) public R removeById(@RequestBody Long[] ids) { - return R.ok(contractService.removeBatchByIds(CollUtil.toList(ids))); + return R.ok(contractService.removeDeep(ids)); } @@ -126,4 +127,26 @@ public List<Contract> export(Contract contract,Long[] ids) { return contractService.list(Wrappers.lambdaQuery(contract).in(ArrayUtil.isNotEmpty(ids), Contract::getId, ids)); } + + /** + * 瀹℃壒閫氳繃鍚堝悓 + * @param id id + * @return R + */ + @Operation(summary = "瀹℃壒閫氳繃鍚堝悓" , description = "瀹℃壒閫氳繃鍚堝悓" ) + @GetMapping("/approved/{id}" ) + public R approved(@PathVariable("id" ) Long id) { + return R.ok(contractService.approved(id)); + } + + /** + * 鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛� + * @return R + */ + @Operation(summary = "鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�" , description = "鑾峰彇瀹℃壒閫氳繃鍚堝悓鐨勪笅鎷夊垪琛�" ) + @GetMapping("/getApprovedContractList" ) + public R getApprovedContractList() { + return R.ok(contractService.getApprovedContractList()); + } + } -- Gitblit v1.9.1