From c675a4c92b636fc4401d545b1d7bab6996b305f0 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Tue, 26 Sep 2023 14:02:28 +0800 Subject: [PATCH] feat:补充提交 --- screen-api/src/main/java/com/moral/api/service/AllocationExtensionService.java | 2 +- screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java | 6 +++--- screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java index f972e7a..d5ded3c 100644 --- a/screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java +++ b/screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java @@ -56,8 +56,8 @@ @GetMapping("check") @ApiOperation("������") public ResultMessage check(@RequestParam @ApiParam(value = "id",name = "������id") Integer id, - @RequestParam @ApiParam(value = "sate",name = "������") Integer sate){ - allocationExtensionService.check(id,sate); + @RequestParam @ApiParam(value = "state",name = "������") Integer state){ + allocationExtensionService.check(id,state); return ResultMessage.ok(); } diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationExtensionService.java b/screen-api/src/main/java/com/moral/api/service/AllocationExtensionService.java index 3c163b9..fd0a982 100644 --- a/screen-api/src/main/java/com/moral/api/service/AllocationExtensionService.java +++ b/screen-api/src/main/java/com/moral/api/service/AllocationExtensionService.java @@ -39,6 +39,6 @@ */ boolean save(AllocationExtensionAddCond allocationExtensionAddCond); - boolean check(Integer id,Integer sate); + boolean check(Integer id,Integer state); } diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java index 998576e..a2259b6 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java @@ -73,16 +73,16 @@ @Override @Transactional - public boolean check(Integer id, Integer sate) { + public boolean check(Integer id, Integer state) { AllocationExtensionExt extensionExt = this.baseMapper.extOne(id); if(!AllocationExtensionApproveEnum.APPLYING.value.equals(extensionExt.getState())){ throw new BusinessException("������������������������������"); } AllocationExtension allocationExtension = new AllocationExtension(); allocationExtension.setId(id); - allocationExtension.setState(sate); + allocationExtension.setState(state); this.baseMapper.updateById(allocationExtension); - if(AllocationExtensionApproveEnum.PASS.value.equals(sate)){ + if(AllocationExtensionApproveEnum.PASS.value.equals(state)){ Allocation allocation = new Allocation(); allocation.setAllocationId(extensionExt.getAllocationId()); allocation.setChangeDay(extensionExt.getChangeDay()+extensionExt.getExtensionNum()); -- Gitblit v1.8.0