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/7] 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:06:31 +0800 Subject: [PATCH 2/7] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GridMemberDataAnalysisResultDTO.java | 2 +- .../service/impl/AggreGridServiceImpl.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java index b100635906..da6758c768 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java @@ -22,7 +22,7 @@ public class GridMemberDataAnalysisResultDTO { // 巡查 private int patrolTimes; - private double totalTime; + private String totalTime; private int patrolRoutineWorkTimes; } 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 346a0f9ecf..ba2a0b7a82 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 @@ -21,11 +21,7 @@ import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; @Service public class AggreGridServiceImpl implements AggreGridService { @@ -144,13 +140,17 @@ public class AggreGridServiceImpl implements AggreGridService { if (gridAndData != null) { GridMemberDataAnalysisResultDTO data = gridAndData.get(d.getGridId()); if (data != null) { + data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes()); data.setPatrolTimes(d.getPatrolTimes()); - // 巡查时长，转为h为单位 - double f = ((double)d.getTotalTime()) / 3600; - BigDecimal h = new BigDecimal(f).setScale(2, RoundingMode.HALF_UP); - data.setTotalTime(h.doubleValue()); - data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes()); + int totalTime = d.getTotalTime(); + if (totalTime > 0){ + int minutes = totalTime / 60; + if (minutes > 0){ + String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分"; + data.setTotalTime(totalTimeDesc); + } + } } } } From 89c8b9b64497b1236a660ed6571045efaa7b1f20 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 16:07:45 +0800 Subject: [PATCH 3/7] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ba2a0b7a82..d0c7b4cfe0 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 @@ -147,7 +147,7 @@ public class AggreGridServiceImpl implements AggreGridService { if (totalTime > 0){ int minutes = totalTime / 60; if (minutes > 0){ - String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分"; + String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分钟"; data.setTotalTime(totalTimeDesc); } } From be0c5f97a3a36a08c951d485b3a17beadfde76f7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 6 Jan 2022 16:09:17 +0800 Subject: [PATCH 4/7] =?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 5/7] =?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); } } From 9edee12fa33e18af1c9145a82aaf734a596c10b4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 6 Jan 2022 16:35:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/PcWorkListResultDTO.java | 4 ++-- .../src/main/java/com/epmet/excel/PcWorkListExport.java | 2 +- .../com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java index 13e8562e2e..0225f9ff7b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java @@ -42,7 +42,7 @@ public class PcWorkListResultDTO implements Serializable { /** * 事项类型名称 */ - private List workTypeName; + private String workTypeName; /** * 有无异常 @@ -94,7 +94,7 @@ public class PcWorkListResultDTO implements Serializable { public PcWorkListResult() { this.title = ""; this.workTypeCode = new ArrayList<>(); - this.workTypeName = new ArrayList<>(); + this.workTypeName = ""; this.isNormal = ""; this.happenAddress = ""; this.happenTime = ""; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java index 12199212a6..e553e205e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java @@ -32,7 +32,7 @@ public class PcWorkListExport { @ExcelProperty("事项类型名称") @ColumnWidth(40) - private String workTypeNames; + private String workTypeName; @ExcelProperty("有无异常") private String isNormal; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index 5e388fc12b..feef559058 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -195,7 +195,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl { - l.setWorkTypeName(disposeWorkTypeCode(workTypeResult.getData(),l.getWorkTypeCode())); + l.setWorkTypeName(disposeWorkTypeCode(workTypeResult.getData(),l.getWorkTypeCode()).stream().collect(Collectors.joining(","))); gridNamesResult.getData().stream().filter(g -> l.getGridId().equals(g.getGridId())).forEach(g -> l.setGridName(g.getGridName())); }); result.setList(list); @@ -220,9 +220,6 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl dtos = pcWorkList(formDTO).getList(); - dtos.forEach(d -> { - d.setWorkTypeNames(d.getWorkTypeName().toString()); - }); List data = ConvertUtils.sourceToTarget(dtos, PcWorkListExport.class); num = data.size(); excelWriter.write(data, writeSheet); From 11e6566b8ab911678e341b488ac72bfb3153cf50 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 6 Jan 2022 16:42:05 +0800 Subject: [PATCH 7/7] ...... --- .../main/java/com/epmet/constant/UserMessageTypeConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java index 3f4407bce8..c4f703049c 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java @@ -196,7 +196,7 @@ public interface UserMessageTypeConstant { * 事件回复、立项、办结操作 * rsi_event.id */ - String EVENT ="event "; + String EVENT ="event"; /** * 需求接单、指派、确认服务时间操作