|
|
|
@@ -208,17 +208,32 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
if (contract.getStatus().intValue() != EnumRentContractStatus.DRAFT.getCode().intValue()) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"租赁合同状态为草稿才能进行此操作"); |
|
|
|
} |
|
|
|
|
|
|
|
if (rentHasValidProperty(contract)) { |
|
|
|
return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。"); |
|
|
|
} |
|
|
|
wxPropertyContractService.updatePropertyContractStatus(proertyContract.getId()); |
|
|
|
return new ResultData(Result.SUCCESS,"合同生效成功!"); |
|
|
|
} |
|
|
|
|
|
|
|
private boolean rentHasValidProperty(WxPropertyContract contract) { |
|
|
|
WxPropertyContract wpc = new WxPropertyContract(); |
|
|
|
wpc.setRentContractId(contract.getRentContractId()); |
|
|
|
wpc.setStatuss(EnumRentContractStatus.getValidStatus()); |
|
|
|
List<WxPropertyContract> list = wxPropertyContractService.findList(wpc); |
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
return true; |
|
|
|
} |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("apply") |
|
|
|
@SystemControllerLog(description = "物业合同-提交审批") |
|
|
|
public ResultData apply(@RequestBody WxPropertyContract proertyContract) { |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
WxPropertyContract contract = wxPropertyContractService.getSimpleDetail(proertyContract.getId()); |
|
|
|
if (null == contract) { |
|
|
|
return new ResultData(Result.ERROR, "编号["+contract.getId()+"]未找到租金合同"); |
|
|
|
return new ResultData(Result.ERROR, "编号["+contract.getContractNumber()+"]未找到租金合同"); |
|
|
|
} |
|
|
|
|
|
|
|
//查询是否有审批流程 |
|
|
|
@@ -226,6 +241,10 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"租赁合同存在工作流,不允许直接生效。"); |
|
|
|
} |
|
|
|
|
|
|
|
if (rentHasValidProperty(contract)) { |
|
|
|
return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。"); |
|
|
|
} |
|
|
|
|
|
|
|
if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { |
|
|
|
if (contract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { |
|
|
|
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, contract.getRemark(), contract.getId(),null)); |
|
|
|
@@ -290,7 +309,8 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
@SystemControllerLog(description = "物业合同-是否存在相关的租赁合同") |
|
|
|
public ResultData hasRentContract(Long rentContractId) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::hasRentContract"); |
|
|
|
return wxPropertyContractService.hasRentContract(rentContractId); |
|
|
|
//return wxPropertyContractService.hasRentContract(rentContractId); |
|
|
|
return new ResultData(false); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("updatePropertyContractStatus") |
|
|
|
|