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

合同续签

release_toaliyun_real
furunxin 5 лет назад
Родитель
Сommit
4f971f7fc6
6 измененных файлов: 63 добавлений и 0 удалений
  1. +45
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
  5. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  6. +9
    -0
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml

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

@@ -0,0 +1,45 @@
package com.iformall.controller.contract;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.domain.po.WxRentContract;
import com.iformall.service.WxPropertyContractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;
import java.util.Map;

/**
* @author: furunxin
* @Date: 2020/7/20 18:11
* @Description:
*/

@Slf4j
@RestController
@Api(description = "物业合同续签")
@RequestMapping("wxPropertyContractExtension")
public class WxPropertyContractExtensionController extends BaseController {

@Autowired
private WxPropertyContractService wxPropertyContractService;


@GetMapping("getMerchantList")
@SystemControllerLog(description = "获取可续签商户列表")
public ResultData getMerchantList() throws Exception{
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.updateTenantInfo(getTenantInfo());
return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getMerchantList(wxPropertyContract));
}
}

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

@@ -13,6 +13,7 @@ import com.iformall.enums.EnumRentStartType;
import com.iformall.service.WxRentContractService;
import com.iformall.service.WxRentPropertyContractService;
import com.iformall.service.WxShopService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +34,7 @@ import java.util.Map;

@Slf4j
@RestController
@Api(description = "租赁合同续签")
@RequestMapping("wxRentContractExtension")
public class WxRentContractExtensionController extends BaseController {



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

@@ -51,4 +51,6 @@ public interface WxPropertyContractMapper extends CommonMapper<WxPropertyContrac
WxPropertyContract findOneByRentId(WxRentContract wxRentContract);

WxPropertyContract getByBill(WxBillProperty billRent);

List<WxRentContract> getMerchantList(WxPropertyContract wxPropertyContract);
}

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

@@ -76,5 +76,6 @@ public interface WxPropertyContractService {

WxPropertyContract getByBill(WxBillProperty billRent);

Object getMerchantList(WxPropertyContract record);

}

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

@@ -1155,6 +1155,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
return wxPropertyContractMapper.getByBill(billRent);
}

@Override
public Object getMerchantList(WxPropertyContract record) {
return wxPropertyContractMapper.getMerchantList(record);
}
}




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

@@ -272,4 +272,13 @@
select property_contract_id from wx_bill_property id = #{id}
)
</select>

<select id="getMerchantList" parameterType="com.iformall.domain.po.WxPropertyContract" resultType="com.iformall.domain.po.WxRentContract">
select rc.* from wx_rent_contract rc
where rc.status in(3,9) and rc.tenant_id=#{tenantId}
and rc.id not in (select pc.rent_contract_id from (
select rent_contract_id from wx_property_contract where tenant_id=#{tenantId}
) pc)
and rent_shop_type = 1
</select>
</mapper>

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