Browse Source

fix contract bill

release_toaliyun_real
winter 2 years ago
parent
commit
6500e1c437
3 changed files with 729 additions and 728 deletions
  1. +13
    -13
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +715
    -714
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 13
- 13
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -804,19 +804,19 @@ public class WxRentContractController extends WxContractBaseController {
return wxRentContractService.update(rentContract, user.getId(),user.getName(), EnumFromType.SWITCH.getCode(),oldDate,false);
}

@GetMapping("exportContract")
@ApiImplicitParams({
@ApiImplicitParam(name = "rentId", value = "rentId", dataType = "Long", paramType = "query", required = false),
@ApiImplicitParam(name = "propertyId", value = "propertyId", dataType = "String", paramType = "query", required = false)})
@SystemControllerLog(description = "租赁合同-导出合同")
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);
}
// @GetMapping("exportContract")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "rentId", value = "rentId", dataType = "Long", paramType = "query", required = false),
// @ApiImplicitParam(name = "propertyId", value = "propertyId", dataType = "String", paramType = "query", required = false)})
// @SystemControllerLog(description = "租赁合同-导出合同")
// 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);
// }


// @GetMapping("/getRentContractStatusInfo")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java View File

@@ -68,7 +68,7 @@ public interface WxRentContractService {

PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageNum, Integer pageSize);

void exportContract(HttpServletRequest request, HttpServletResponse response, Long rentId,Long propertyId);
//void exportContract(HttpServletRequest request, HttpServletResponse response, Long rentId,Long propertyId);

ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate,boolean writeComplate);



+ 715
- 714
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
File diff suppressed because it is too large
View File


Loading…
Cancel
Save