diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 1380e56e..bc70b8a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -227,16 +227,16 @@ public class PayIncomeContractController extends JeroController archive(@RequestBody PayIncomeContract payIncomeContract) { - if(StringUtils.isBlank(payIncomeContract.getId())){ + public Result archive(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { + if(StringUtils.isBlank(payIncomeContractAudit.getContractId())){ return Result.error("id不能为空!"); } - payIncomeContractService.updateArchive(payIncomeContract.getId()); + payIncomeContractService.updateArchive(payIncomeContractAudit); return Result.OK("归档成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java index e1f5d965..5be6f598 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java @@ -99,11 +99,11 @@ public interface IPayIncomeContractService extends IService { * @Description 归档 * @Author lqt * @Date 2021/9/5 - * @Param id 合同id + * @Param payIncomeContractAudit 审核记录 * @Return * @Exception */ - void updateArchive(String id); + void updateArchive(PayIncomeContractAudit payIncomeContractAudit); /** * @Description 删除 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 90902abe..352c0f8c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -425,10 +425,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayIncomeContract = new LambdaUpdateWrapper<>(); updatePayIncomeContract.set(PayIncomeContract::getUpdateBy,sysUser.getUsername()); updatePayIncomeContract.set(PayIncomeContract::getUpdateTime,new Date()); updatePayIncomeContract.eq(PayIncomeContract::getId,payIncomeContract.getId()); - updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS3); + updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS2); payIncomeContractService.update(updatePayIncomeContract); } @@ -484,24 +486,25 @@ public class PayIncomeContractServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper(); update.set(PayIncomeContract::getUpdateBy,sysUser.getUsername()); update.set(PayIncomeContract::getUpdateTime,new Date()); - update.set(PayIncomeContract::getId,payIncomeContractAudit.getContractId()); - update.eq(PayIncomeContract::getStatus, payIncomeContractAudit.getContractStatus()); + update.eq(PayIncomeContract::getId,payIncomeContractAudit.getContractId()); + update.set(PayIncomeContract::getStatus, payIncomeContractAudit.getContractStatus()); payIncomeContractService.update(update); // 添加审核记录 payIncomeContractAuditService.save(payIncomeContractAudit); @@ -509,8 +512,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper(); update.set(PayIncomeContract::getUpdateBy,sysUser.getUsername()); update.set(PayIncomeContract::getUpdateTime,new Date()); - update.eq(PayIncomeContract::getId,id); + update.eq(PayIncomeContract::getId,payIncomeContractAudit.getContractId()); update.set(PayIncomeContract::getStatus, PayIncomeContractCommon.STATUS5); payIncomeContractService.update(update); // 添加归档记录 - PayIncomeContractAudit payIncomeContractAudit = new PayIncomeContractAudit(); - payIncomeContractAudit.setContractId(id); payIncomeContractAudit.setContractStatus(PayIncomeContractCommon.STATUS5); payIncomeContractAuditService.save(payIncomeContractAudit); }