|
|
|
@ -22,6 +22,7 @@ import jnpf.service.ParkService;
|
|
|
|
|
import jnpf.service.SpacecontractService;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
@ -565,8 +566,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
|
|
|
|
|
if ("10".equals(contract.getContractStatus()) || "21".equals(contract.getContractStatus())) {
|
|
|
|
|
//查询绑定了哪些空间
|
|
|
|
|
List<String> spaceIds = spacecontractService.findByNums(contract.getContractNumber());
|
|
|
|
|
if (!parkService.queryStatus(spaceIds)){
|
|
|
|
|
return "该合同空间状态存在不是待租状态,请确认!";
|
|
|
|
|
if (CollectionUtils.isNotEmpty(spaceIds)) {
|
|
|
|
|
if (!parkService.queryStatus(spaceIds)) {
|
|
|
|
|
return "该合同空间状态存在不是待租状态,请确认!";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
contract.setContractStatus(request.getContractStatus());
|
|
|
|
|
contract.setApproveDate(DateUtil.getNowDate());
|
|
|
|
|