Browse Source

超时规则更新超时1天算超时

master
gjh 3 weeks ago
parent
commit
354d62c7b9
  1. 8
      huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
  2. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ContractPayInfoDTO.java
  3. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
  4. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
  5. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

8
huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java

@ -533,10 +533,10 @@ public class HuzhouProjectController {
} }
@GetMapping("/queryContractPaySituation") @GetMapping("/querySubContractPaySituation")
public Result<List<ContractPayInfoDTO>> queryContractPaySituation(){ public Result<List<ContractPayInfoDTO>> querySubContractPaySituation(){
//ContractPayInfoDTO tmp = contractinfoService.queryContractPaySituation(projectInfo); //ContractPayInfoDTO tmp = contractinfoService.queryContractPaySituation(projectInfo);
List<ContractPayInfoDTO> result = projectinfoService.queryContractPaySituation(); List<ContractPayInfoDTO> result = projectinfoService.querySubContractPaySituation();
return Result.ok(result); return Result.ok(result);
} }
@ -553,6 +553,6 @@ public class HuzhouProjectController {
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), ContractPayInfoDTO.class) EasyExcel.write(response.getOutputStream(), ContractPayInfoDTO.class)
.sheet("子项目超时情况"+currentDate) .sheet("子项目超时情况"+currentDate)
.doWrite(projectinfoService.queryContractPaySituation()); .doWrite(projectinfoService.querySubContractPaySituation());
} }
} }

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ContractPayInfoDTO.java

@ -17,7 +17,7 @@ public class ContractPayInfoDTO {
@ExcelProperty(value = "超时支付情况") @ExcelProperty(value = "超时支付情况")
private String timeOutPaySituation; private String timeOutPaySituation;
/** /**
* 超时支付次数 (超时7天以上为超时1次) * 超时支付次数 (超时1天以上为超时1次)
*/ */
@ExcelProperty(value = "超时支付次数") @ExcelProperty(value = "超时支付次数")
private int timeOutPayCount; private int timeOutPayCount;

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java

@ -249,6 +249,6 @@ public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo> {
void fillSuperiorFundPayRateByChildren(List<HuzhouProjectinfo> projectInfoList); void fillSuperiorFundPayRateByChildren(List<HuzhouProjectinfo> projectInfoList);
List<ContractPayInfoDTO> queryContractPaySituation(); List<ContractPayInfoDTO> querySubContractPaySituation();
} }

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java

@ -577,7 +577,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
} }
resultDesc.append(String.format("第%d笔属性:%s-超时: %d 天", resultDesc.append(String.format("第%d笔属性:%s-超时: %d 天",
paymentIndex, planContract.getTaskName(), daysDifference)); paymentIndex, planContract.getTaskName(), daysDifference));
// 如果超时超过7天,则增加超时次数 // 如果超时超过1天,则增加超时次数
if (daysDifference >= 1) { if (daysDifference >= 1) {
timeOutPayCount++; timeOutPayCount++;
} }

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@ -3066,7 +3066,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
} }
@Override @Override
public List<ContractPayInfoDTO> queryContractPaySituation() { public List<ContractPayInfoDTO> querySubContractPaySituation() {
List<ContractPayInfoDTO> addList =new ArrayList<>(); List<ContractPayInfoDTO> addList =new ArrayList<>();
List<HuzhouSubProjectinfo> subProjects = subProjectinfoService.list(); List<HuzhouSubProjectinfo> subProjects = subProjectinfoService.list();
for (HuzhouSubProjectinfo projectInfo : subProjects) { for (HuzhouSubProjectinfo projectInfo : subProjects) {

Loading…
Cancel
Save