|
|
|
@@ -77,35 +77,35 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(map); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 作废 |
|
|
|
* @param wxRentContract |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@PostMapping("/unvalid") |
|
|
|
@SystemControllerLog(description = "租金合同-作废合同") |
|
|
|
public ResultData unvalid(@RequestBody WxRentContract wxRentContract) { |
|
|
|
WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId()); |
|
|
|
if (null == contract) { |
|
|
|
return new ResultData(Result.ERROR, "合同不存在."); |
|
|
|
} |
|
|
|
MallUserInfo user = this.getUser(); |
|
|
|
if (contract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue() || |
|
|
|
contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || |
|
|
|
(contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() |
|
|
|
&& (contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue() || |
|
|
|
contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { |
|
|
|
contract.setStatus(EnumRentContractStatus.INVALID.getCode()); |
|
|
|
contract.setUpdatetime(new Date()); |
|
|
|
contract.setUpdateBy(user.getId()); |
|
|
|
wxRentContractService.updateRentContract(contract); |
|
|
|
//删除预览的账单 |
|
|
|
wxRentContractService.deletePrewBill(contract); |
|
|
|
return new ResultData(); |
|
|
|
}else { |
|
|
|
return new ResultData(Result.ERROR, "合同状态不允许作废.只能作废草稿或者履约拒绝的合同。"); |
|
|
|
} |
|
|
|
} |
|
|
|
// /** |
|
|
|
// * 作废 |
|
|
|
// * @param wxRentContract |
|
|
|
// * @return |
|
|
|
// */ |
|
|
|
// @PostMapping("/unvalid") |
|
|
|
// @SystemControllerLog(description = "租金合同-作废合同") |
|
|
|
// public ResultData unvalid(@RequestBody WxRentContract wxRentContract) { |
|
|
|
// WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId()); |
|
|
|
// if (null == contract) { |
|
|
|
// return new ResultData(Result.ERROR, "合同不存在."); |
|
|
|
// } |
|
|
|
// MallUserInfo user = this.getUser(); |
|
|
|
// if (contract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue() || |
|
|
|
// contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || |
|
|
|
// (contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() |
|
|
|
// && (contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue() || |
|
|
|
// contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { |
|
|
|
// contract.setStatus(EnumRentContractStatus.INVALID.getCode()); |
|
|
|
// contract.setUpdatetime(new Date()); |
|
|
|
// contract.setUpdateBy(user.getId()); |
|
|
|
// wxRentContractService.updateRentContract(contract); |
|
|
|
// //删除预览的账单 |
|
|
|
// wxRentContractService.deletePrewBill(contract); |
|
|
|
// return new ResultData(); |
|
|
|
// }else { |
|
|
|
// return new ResultData(Result.ERROR, "合同状态不允许作废.只能作废草稿或者履约拒绝的合同。"); |
|
|
|
// } |
|
|
|
// } |
|
|
|
|
|
|
|
/** |
|
|
|
* 终止 |
|
|
|
|