From 1ea0a103f2179901172c8df52f88f69bc9e6b6b0 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 26 Aug 2020 20:14:07 +0800 Subject: [PATCH] fix contract --- .../controller/contract/WxPropertyContractController.java | 3 ++- .../iformall/controller/contract/WxRentContractController.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index dd3f4ce5f..edef2bb8d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -298,7 +298,8 @@ public class WxPropertyContractController extends WxContractBaseController { @SystemControllerLog(description = "物业合同-更新合同状态") public ResultData updatePropertyContractStatus(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentContractStatus"); - return wxPropertyContractService.updatePropertyContractStatus(wxPropertyContract.getId()); + //return wxPropertyContractService.updatePropertyContractStatus(wxPropertyContract.getId()); + return new ResultData(); } /** diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 9b73055e2..1f1444a5d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -526,6 +526,7 @@ public class WxRentContractController extends WxContractBaseController { if (1 == validStatus) { wxRentContract.setStatuss(EnumRentContractStatus.getValidStatus()); } + wxRentContract.setSortColumns(SortField.Createtime_DESC); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); }