Просмотр исходного кода

[物业合同][修改][查询签约租赁合同]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
28d9c4d238
5 измененных файлов: 25 добавлений и 0 удалений
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  4. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  5. +7
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java Просмотреть файл

@@ -196,4 +196,12 @@ public class WxRentContractController extends BaseController {
return new ResultData();
}

@GetMapping("/getMerchants")
@SystemControllerLog(description = "租赁合同-获取已签约租赁合同且未有物业的商户")
public ResultData getMerchants(@ModelAttribute WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::getMerchants");
wxRentContract.setTenantId(getTenantId());
return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract));
}

}

+ 3
- 0
mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java Просмотреть файл

@@ -44,4 +44,7 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Strin
void updateStatus(WxRentContract wxRentContract);

long queryOweCount(WxRentContract wxRentContract);

List<WxRentContract> getMerchants(WxRentContract wxRentContract);

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Просмотреть файл

@@ -75,4 +75,5 @@ public interface WxRentContractService {

void buildDeposit(WxMerchant wxMerchant, Long userId,Long rentContractId);

Object getMerchants(WxRentContract wxRentContract);
}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -451,6 +451,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
}

@Override
public Object getMerchants(WxRentContract wxRentContract) {
List<WxRentContract> rentContractList = wxRentContractMapper.getMerchants(wxRentContract);
return rentContractList;
}

@Override
@Transactional(rollbackFor = {Exception.class})
public List<WxBillRent> buildRent(WxMerchant wxMerchant, Long userId,WxRentContract rentContract,Integer isPreview) {


+ 7
- 0
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -212,5 +212,12 @@
select count(*) from wx_rent_contract r,wx_bill_rent b
where b.rent_contract_id = r.id and b.status = 1 and r.id = #{id}
</select>
<select id="getMerchants" parameterType="com.iformall.domain.po.WxRentContract"
resultType="com.iformall.domain.po.WxRentContract">
select * from wx_rent_contract where status in(2,3,4)
and merchant_id not in(select merchant_id from wx_property_contract where status in(2,3,4))
<if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if>
</select>

</mapper>

Загрузка…
Отмена
Сохранить