feat:补充提交

cjl

2023-09-26 c675a4c92b636fc4401d545b1d7bab6996b305f0

feat:补充提交

 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();
    }


 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);

}

 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());