From 7424b29a429d58d511676e045b0928cd97b13973 Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期五, 07 三月 2025 15:25:57 +0800 Subject: [PATCH] feat: 上传文件存库 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java index 2152931..5a0e81a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java @@ -124,7 +124,7 @@ new ImmutableMap.Builder<String, Long>(). put("id", flwTask.getId()) .build(); - QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+10*1000L), maps); + QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+48*60*60*1000L), maps); } } } @@ -184,15 +184,13 @@ if (contractRentType!=null){ BeanUtils.copyProperties(contractRentType,res); } - TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>() - .eq(TContract::getHouseId,contract.getHouseId()) - .eq(TContract::getStatus, 4) - .le(TContract::getStartTime, LocalDateTime.now()) - .ge(TContract::getEndTime, LocalDateTime.now())); +// TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>() +// .eq(TContract::getHouseId,contract.getHouseId()) +// .eq(TContract::getStatus, 4) +// .le(TContract::getStartTime, LocalDateTime.now()) +// .ge(TContract::getEndTime, LocalDateTime.now())); THouse house = houseService.getById(contract.getHouseId()); - if (oldContract!=null){ - house.setTenantType(oldContract.getPayType()); - } + house.setTenantType(contract.getPayType()); res.setHouse(house); List<TBill> list = billService.lambdaQuery() .eq(TBill::getContractId, id) -- Gitblit v1.7.1