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

Merge branch 'release_toaliyun_real' into release_real_200809

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
afd557ca7a
1 измененных файлов: 8 добавлений и 3 удалений
  1. +8
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

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

@@ -775,10 +775,15 @@ public class WxRentContractController extends WxContractBaseController {
@GetMapping("exportContract")
@ApiImplicitParams({
@ApiImplicitParam(name = "rentId", value = "rentId", dataType = "Long", paramType = "query", required = false),
@ApiImplicitParam(name = "propertyId", value = "propertyId", dataType = "Long", paramType = "query", required = false)})
@ApiImplicitParam(name = "propertyId", value = "propertyId", dataType = "String", paramType = "query", required = false)})
@SystemControllerLog(description = "租赁合同-导出合同")
public void exportContract(Long rentId,Long propertyId,HttpServletRequest request, HttpServletResponse response){
wxRentContractService.exportContract(request,response,rentId,propertyId);
public void exportContract(Long rentId,String propertyId,HttpServletRequest request, HttpServletResponse response){
Long pid = null;
try {
pid = Long.parseLong(propertyId);
}catch(Exception e) {
}
wxRentContractService.exportContract(request,response,rentId,pid);
}




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