diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java index 70bfd765..34b314e0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java @@ -331,4 +331,7 @@ public class EnforcementRegistrationBo extends BaseEntity { */ private String searchValue; + private String lawEnforceCategoryText; + + private String checkCategoryText; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java index 7573c3d1..5df47eb9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java @@ -174,4 +174,6 @@ public class EnforcementRegistrationListVo implements Serializable { } return 0; } + + private Long outTimeDayNum; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index 28889573..3c1ac1ec 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -439,6 +439,14 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat try { allUserIds.add(Convert.toLong(idStr.trim())); } catch (Exception ignored) {} } } + // 判断超时多少天 + Instant instant = vo.getEnforcementTime().toInstant(); + ZoneId zoneId = ZoneId.systemDefault(); + LocalDate startDate = instant.atZone(zoneId).toLocalDate(); + // 今天距离执法时间所差天数 + long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now()); + vo.setOutTimeDayNum(daysBetween); + } // 一次批量查询所有用户 Map userMap = new HashMap<>(); @@ -512,6 +520,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } } + + return TableDataInfo.build(result); }