|
|
|
@@ -79,14 +79,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
@Override |
|
|
|
public Map<String, Object> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { |
|
|
|
//Object rentContractStatusInfo = getRentContractStatusInfo(record); |
|
|
|
// PageHelper.startPage(pageIndex, pageSize); |
|
|
|
// List<Map<String, Object>> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); |
|
|
|
// PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(rentContractData); |
|
|
|
// Map<String, Object> result = new HashMap<>(); |
|
|
|
// //result.put("rentContractStatusInfo", rentContractStatusInfo); |
|
|
|
// result.put("pageInfo", pageInfo); |
|
|
|
// return result; |
|
|
|
return null; |
|
|
|
PageHelper.startPage(pageIndex, pageSize); |
|
|
|
//List<Map<String, Object>> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); |
|
|
|
//result.put("rentContractStatusInfo", rentContractStatusInfo); |
|
|
|
result.put("pageInfo", pageInfo); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -307,18 +306,18 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "物业费要大于0"); |
|
|
|
} |
|
|
|
|
|
|
|
WxPropertyContract propertyContract = new WxPropertyContract(); |
|
|
|
propertyContract.updateTenantInfo(wxRentContract); |
|
|
|
propertyContract.setRentContractId(record.getRentContractId()); |
|
|
|
long count = wxPropertyContractMapper.findList(propertyContract) |
|
|
|
// .stream().filter(p -> p.getStatus().equals(EnumRentContractStatus.READY_FOR_PAING.getCode()) || |
|
|
|
// p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
|
// p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); |
|
|
|
.stream().filter(p -> p.getStatus().equals(EnumRentContractStatus.READY_FOR_PAING.getCode()) || |
|
|
|
p.getStatus().equals(EnumRentContractStatus.PAING.getCode())).count(); |
|
|
|
if (count > 1) { |
|
|
|
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); |
|
|
|
} |
|
|
|
// WxPropertyContract propertyContract = new WxPropertyContract(); |
|
|
|
// propertyContract.updateTenantInfo(wxRentContract); |
|
|
|
// propertyContract.setRentContractId(record.getRentContractId()); |
|
|
|
// long count = wxPropertyContractMapper.findList(propertyContract) |
|
|
|
//// .stream().filter(p -> p.getStatus().equals(EnumRentContractStatus.READY_FOR_PAING.getCode()) || |
|
|
|
//// p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
|
//// p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); |
|
|
|
// .stream().filter(p -> p.getStatus().equals(EnumRentContractStatus.READY_FOR_PAING.getCode()) || |
|
|
|
// p.getStatus().equals(EnumRentContractStatus.PAING.getCode())).count(); |
|
|
|
// if (count > 1) { |
|
|
|
// return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); |
|
|
|
// } |
|
|
|
//保存物业合同信息 |
|
|
|
String message; |
|
|
|
boolean hasFlow = true; |
|
|
|
@@ -916,7 +915,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
@Transactional(rollbackFor = {Exception.class}) |
|
|
|
@Override |
|
|
|
public ResultData endRentContract(Long id) { |
|
|
|
|
|
|
|
WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(id); |
|
|
|
if (wxPropertyContract == null) { |
|
|
|
return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); |
|
|
|
@@ -925,6 +923,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
try { |
|
|
|
wxPropertyContract.setUpdatetime(new Date()); |
|
|
|
wxPropertyContractMapper.updateById(wxPropertyContract); |
|
|
|
|
|
|
|
//物业账单失效 |
|
|
|
WxBillProperty billProperty = new WxBillProperty(); |
|
|
|
billProperty.setPropertyContractId(id); |
|
|
|
wxBillPropertyMapper.updateInvalidStatus(billProperty); |
|
|
|
|
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.info("终止合同失败:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
@@ -947,27 +951,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
// return contractList; |
|
|
|
// } |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData endPropertyContractByRentContractId(Long rentContractId) { |
|
|
|
// WxPropertyContract wxPropertyContractParam = new WxPropertyContract(); |
|
|
|
// wxPropertyContractParam.setRentContractId(rentContractId); |
|
|
|
// wxPropertyContractMapper.findList(wxPropertyContractParam); |
|
|
|
// //List<Map<String, Object>> contractData = wxPropertyContractMapper.queryPropertyContractData(wxPropertyContractParam); |
|
|
|
// if (contractData.size() == 0) { |
|
|
|
// return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); |
|
|
|
// } |
|
|
|
// Map<String, Object> contractMap = contractData.get(0); |
|
|
|
// WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById((Long) contractMap.get("id")); |
|
|
|
// wxPropertyContract.setStatus(EnumRentContractStatus.TERMINATE.getCode()); |
|
|
|
// try { |
|
|
|
// wxPropertyContractMapper.updateById(wxPropertyContract); |
|
|
|
// } catch (MallinkException e) { |
|
|
|
// logger.info("终止合同失败:" + e.getMessage()); |
|
|
|
// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
// } |
|
|
|
return new ResultData(Result.SUCCESS, "操作成功"); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData hasRentContract(Long rentContractId) { |
|
|
|
if (null == rentContractId) { |
|
|
|
|