diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java index 72a34dab..60343a15 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java @@ -44,6 +44,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.net.URLEncoder; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; @Api(tags = "材料站结算申请接口") @@ -244,6 +246,15 @@ public class ClzSltAgreementInfoController extends BaseController { }else{ bean.setOverDay(overdueDays-7); } + if(date!=null && !date.isEmpty()){ + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + LocalDate dateParm = LocalDate.parse(date, formatter); + LocalDate resultDate = dateParm.plusDays(7); + bean.setOverTime(resultDate+""); + } + + bean.setActualExitTime(date); BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal num = bean.getNum(); @@ -527,6 +538,8 @@ public class ClzSltAgreementInfoController extends BaseController { if(date!=null && !date.isEmpty()){ listAll.get(0).setActualExitTime(date); + }else{ + listAll.get(0).setActualExitTime("暂无"); } projectNames.add(listAll.get(0).getProjectName()); unitNames.add(listAll.get(0).getUnitName());