diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 900c9bfbd..2fa42b317 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -129,6 +129,8 @@ public class WxShopController extends BaseController { wxShop.updateTenantInfo(getTenantInfo()); if (null != wxShop.getSortWay() && 1 == wxShop.getSortWay()) { wxShop.setSortColumns(SortField.CreateDate_DESC); + }else if (null != wxShop.getSortWay() && 2 == wxShop.getSortWay()) { + wxShop.setSortColumns(SortField.UpdateDate_DESC); }else { wxShop.setSortColumn("shop_number asc"); } 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 0cd127562..512f9b1f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -171,6 +171,17 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setRentInfo(rentContract.getRentInfo()); wxPropertyContract.setCustomersId(rentContract.getCustomersId()); wxPropertyContract.setShopIdStr(rentContract.getShopIdStr()); + //如果是租金+物业的,则租金和物业一一对应。 + if (wxPropertyContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()){ + WxPropertyContract pq = new WxPropertyContract(); + pq.updateTenantInfo(rentContract); + pq.setRentContractId(rentContract.getId()); + pq.setOperationType(EnumContractOperationType.WHOLE.getCode()); + List plist = wxPropertyContractService.findList(pq); + if (null != plist && plist.size() > 0 ) { + wxPropertyContract.setId(plist.get(0).getId()); + } + } } wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode()); return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false);