From 3c76b2ec303e65a68fd7da384a2479c4179dc1d8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 16:38:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81][=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 10 +++++----- .../impl/WxRentContractServiceImpl.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 30e0f45ae..01d05bb16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -430,11 +430,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } }else{ - //合同状态改为记租中 - WxRentContract updateRentContract = new WxRentContract(); - updateRentContract.setId(record.getRentContractId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + //审批状态重置 + WxPropertyContract updateRentContract = new WxPropertyContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + wxPropertyContractMapper.updateByPrimaryKeySelective(updateRentContract); } return new ResultData(Result.SUCCESS, message, record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 51194402c..9e68f65cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -511,11 +511,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("id:{},启动审批流成功, 是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } }else{ - //合同状态改为记租中 + //审批状态重置 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + updateApplyStatus(updateRentContract); } //生成预览账单(补录第二步,第三步走编辑) @@ -574,11 +574,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("id:{},启动审批流成功 ,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } }else{ - //合同状态改为记租中 + //审批状态重置 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + updateApplyStatus(updateRentContract); } //保存调整金额(预账单调整) @@ -1655,11 +1655,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("id:{},启动审批流成功,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } }else{ - //合同状态改为记租中 + //审批状态重置 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + updateApplyStatus(updateRentContract); } return resultData;