diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java index 2ccd975..74b6559 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java @@ -533,10 +533,10 @@ public class HuzhouProjectController { } - @GetMapping("/queryContractPaySituation") - public Result> queryContractPaySituation(){ + @GetMapping("/querySubContractPaySituation") + public Result> querySubContractPaySituation(){ //ContractPayInfoDTO tmp = contractinfoService.queryContractPaySituation(projectInfo); - List result = projectinfoService.queryContractPaySituation(); + List result = projectinfoService.querySubContractPaySituation(); return Result.ok(result); } @@ -553,6 +553,6 @@ public class HuzhouProjectController { response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); EasyExcel.write(response.getOutputStream(), ContractPayInfoDTO.class) .sheet("子项目超时情况"+currentDate) - .doWrite(projectinfoService.queryContractPaySituation()); + .doWrite(projectinfoService.querySubContractPaySituation()); } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ContractPayInfoDTO.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ContractPayInfoDTO.java index 153d87d..9a5e171 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ContractPayInfoDTO.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ContractPayInfoDTO.java @@ -17,7 +17,7 @@ public class ContractPayInfoDTO { @ExcelProperty(value = "超时支付情况") private String timeOutPaySituation; /** - * 超时支付次数 (超时7天以上为超时1次) + * 超时支付次数 (超时1天以上为超时1次) */ @ExcelProperty(value = "超时支付次数") private int timeOutPayCount; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java index 837dc04..a0aa0a2 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java @@ -249,6 +249,6 @@ public interface IHuzhouProjectinfoService extends IService { void fillSuperiorFundPayRateByChildren(List projectInfoList); - List queryContractPaySituation(); + List querySubContractPaySituation(); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 3ee9224..0d09649 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -577,7 +577,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl= 1) { timeOutPayCount++; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index 444b368..6bb0ff6 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -3066,7 +3066,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl queryContractPaySituation() { + public List querySubContractPaySituation() { List addList =new ArrayList<>(); List subProjects = subProjectinfoService.list(); for (HuzhouSubProjectinfo projectInfo : subProjects) {