From 36484f8fa1668df588fa76d69e75733456f6902c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 6 Jan 2022 16:06:08 +0800 Subject: [PATCH 1/3] emm --- .../src/main/java/com/epmet/dto/TimeDTO.java | 2 ++ .../impl/IcPartyServiceCenterServiceImpl.java | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java index 00b01c30fe..f80b084980 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java @@ -18,5 +18,7 @@ public class TimeDTO implements Serializable { private Boolean isAppointment = true; + private Boolean isMiss = false; + private String time; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index 9b1e1d02d0..bc76004610 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -441,9 +441,20 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl { - t.setIsAppointment(false); - }); + if (CollectionUtils.isNotEmpty(records)) { + records.forEach(r -> { + String[] split = r.getTimeId().split(","); + for (String s : split) { + for (TimeDTO t : timeList) { + if (s.equals(t.getTimeId())) { + t.setIsAppointment(false); + t.setIsMiss(true); + break; + } + } + } + }); + } result.setTimeDetail(timeList); return result; } @@ -454,6 +465,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl Date: Thu, 6 Jan 2022 16:09:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyServiceCenterServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index bc76004610..8522e229fb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -438,6 +438,17 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl { + String[] split = r.getTimeId().split(","); + for (String s : split) { + if (s.equals(t.getTimeId())) { + t.setIsMiss(true); + break; + } + } + }); + } } } if (LocalDate.now().isAfter(LocalDate.parse(formDTO.getDate()))){ From f059a9ccf9dba5fd3fd4d8961c325894be2445f1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 16:13:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=88=86=E9=92=9F=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/impl/AggreGridServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java index d0c7b4cfe0..89d865ae98 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.service.impl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -142,12 +143,12 @@ public class AggreGridServiceImpl implements AggreGridService { if (data != null) { data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes()); data.setPatrolTimes(d.getPatrolTimes()); - + data.setTotalTime(NumConstant.ZERO_STR); int totalTime = d.getTotalTime(); - if (totalTime > 0){ - int minutes = totalTime / 60; - if (minutes > 0){ - String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分钟"; + if (totalTime > NumConstant.ZERO){ + int minutes = totalTime / NumConstant.SIXTY; + if (minutes > NumConstant.ZERO){ + String totalTimeDesc = minutes / NumConstant.SIXTY + "小时"+ minutes % NumConstant.SIXTY + "分钟"; data.setTotalTime(totalTimeDesc); } }