diff --git a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java index 494c5a5..3f36aa0 100644 --- a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java @@ -9,6 +9,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.*; import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -197,4 +198,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { public static String toString(LocalDate date){ return toString(date,"yyyy-MM-dd"); } + + public static long differentMonth(Date date,Date date2){ + LocalDate startDate = date.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate(); + LocalDate endDate = date2.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate(); + return ChronoUnit.MONTHS.between(startDate.withDayOfMonth(1), endDate.withDayOfMonth(1)); + + } } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index dd6dfb8..294124d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -616,10 +616,18 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { if(vo.getFirstApplyDate() != null){ Date date = new Date(); Date startDate = vo.getFirstApplyDate(); - int year = (date.getYear() - startDate.getYear()); - int month = (date.getMonth() - startDate.getMonth()); - int day = (date.getDate() - startDate.getDate()); - vo.setConTime((year>0?year+"年":"")+(month>0?month+"月":"")+(day>0?day+"天":"") ); + long num = DateUtils.differentMonth(startDate,date); + if(num<=0){ + vo.setConTime("0"); + }else if(num<12){ + vo.setConTime(num+"个月"); + }else { + vo.setConTime(((int)(num/12))+"年"+num%12+"个月"); + } +// int year = (date.getYear() - startDate.getYear()); +// int month = (date.getMonth() - startDate.getMonth()); +//// int day = (date.getDate() - startDate.getDate()); +// vo.setConTime((year>0?year+"年":"")+(month>0?month+"月":"")/*+(day>0?day+"天":"") */); } //电子签章审批 if(StringUtils.equals(CommonStatusEnum.FAIL.getCode(),vo.getSignStatus())){