From f17075b75c70ddfc87c34380d4b6701326002dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 28 Nov 2023 13:13:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-event/event-boot/Dockerfile | 16 +- .../dim/impl/DimGlobalDealServiceImpl.java | 397 ++++++++++++------ 2 files changed, 268 insertions(+), 145 deletions(-) diff --git a/pqs-event/event-boot/Dockerfile b/pqs-event/event-boot/Dockerfile index 6bc8aa8c8..9b230ad52 100644 --- a/pqs-event/event-boot/Dockerfile +++ b/pqs-event/event-boot/Dockerfile @@ -1,15 +1,5 @@ -FROM eclipse-temurin:8-jdk-centos7 -MAINTAINER hongawen_13914774158@163.com -ENV JAVA_OPTS="-Xms1024m -Xmx1024m" -# 挂载时区的目录 -VOLUME /usr/share/zoneinfo -# 设置时区为上海 -ENV TZ=Asia/Shanghai -# 设置时区信息 -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +FROM openjdk:8-jdk-alpine ADD target/eventboot.jar eventboot.jar -ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /eventboot.jar +ENTRYPOINT ["java","-jar","/eventboot.jar"] EXPOSE 10203 - - - +RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java index 95192a24e..60e8626b5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java @@ -97,7 +97,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimMonitorRateY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getBusMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -109,7 +110,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); + dimGlobalDataVO.setOrgName(d.getName()); resultList.add(dimGlobalDataVO); } } @@ -126,7 +128,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimMonitorRateM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getBusMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -138,7 +141,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -155,7 +159,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimMonitorRateD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getBusMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -167,7 +172,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -189,7 +195,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimMonitorRateY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getStationMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -201,7 +208,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -217,7 +225,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimMonitorRateM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getBusMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -229,7 +238,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -245,7 +255,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimMonitorRateD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getBusMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -257,7 +268,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -278,7 +290,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -290,7 +303,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -306,7 +320,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -318,7 +333,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -334,7 +350,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -346,7 +363,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -367,7 +385,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getStationLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -379,7 +398,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -395,7 +415,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getStationLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -407,7 +428,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -423,7 +445,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getStationLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -435,7 +458,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -456,7 +480,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getStationLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -468,7 +493,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -484,7 +510,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getStationLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -496,7 +523,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -512,7 +540,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getStationLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -524,7 +553,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -545,7 +575,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusGlobalY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -557,7 +588,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -573,7 +605,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusGlobalM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -585,7 +618,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -601,7 +635,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusGlobalD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -613,7 +648,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -636,7 +672,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -648,7 +685,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -664,7 +702,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -676,7 +715,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -693,7 +733,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -705,7 +746,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -726,7 +768,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getPassRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -738,7 +781,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -755,7 +799,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getPassRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -767,7 +812,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -784,7 +830,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getPassRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -796,7 +843,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -818,7 +866,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -830,7 +879,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -846,7 +896,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -858,7 +909,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -874,7 +926,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -886,7 +939,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -906,7 +960,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusTargetYPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -918,7 +973,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -934,7 +990,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusTargetMPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -946,7 +1003,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -962,7 +1020,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusTargetDPO::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -974,7 +1033,9 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -999,7 +1060,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1011,7 +1073,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1029,7 +1092,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1041,7 +1105,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1059,7 +1124,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1071,7 +1137,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1094,7 +1161,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getPassRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1106,7 +1174,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1124,7 +1193,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getPassRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1136,7 +1206,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1154,7 +1225,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getPassRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1166,7 +1238,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1189,7 +1262,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1201,7 +1275,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1219,7 +1294,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1231,7 +1307,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1249,7 +1326,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1261,7 +1339,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1284,7 +1363,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1296,7 +1376,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1314,7 +1395,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1326,7 +1408,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1344,7 +1427,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1356,7 +1440,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1378,7 +1463,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimBusStationEventY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1390,7 +1476,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1406,7 +1493,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimBusStationEventM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1418,7 +1506,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1434,7 +1523,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimBusStationEventD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1446,7 +1536,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1467,7 +1558,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1479,7 +1571,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1495,7 +1588,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1507,7 +1601,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1523,7 +1618,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1535,7 +1631,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1556,7 +1653,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1568,7 +1666,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1584,7 +1683,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1596,7 +1696,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1612,7 +1713,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1624,7 +1726,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1645,7 +1748,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimStationTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1657,7 +1761,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1673,7 +1778,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimStationTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1685,7 +1791,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1701,7 +1808,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimStationTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getPassAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1713,7 +1821,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1737,7 +1846,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimObjRateY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getObjMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1749,7 +1859,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1766,7 +1877,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimObjRateM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getObjMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1778,7 +1890,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1795,7 +1908,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimObjRateD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getObjMonitorRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1807,7 +1921,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1830,7 +1945,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimObjGlobalY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1842,7 +1958,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1859,7 +1976,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimObjGlobalM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1871,7 +1989,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1888,7 +2007,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimObjGlobalD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1900,7 +2020,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1923,7 +2044,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimObjGlobalY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1935,7 +2057,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1952,7 +2075,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimObjGlobalM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1964,7 +2088,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -1981,7 +2106,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimObjGlobalD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitAvgRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -1993,7 +2119,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -2018,7 +2145,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapY = yList.stream().collect(Collectors.toMap(RDimObjTargetY::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapY.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapY.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -2030,7 +2158,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -2049,7 +2178,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapM = mList.stream().collect(Collectors.toMap(RDimObjTargetM::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapM.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapM.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -2061,7 +2191,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } } @@ -2078,7 +2209,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { Map mapD = dList.stream().collect(Collectors.toMap(RDimObjTargetD::getOrgId, Function.identity())); for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); if (mapD.containsKey(d.getCode())) { dimGlobalDataVO.setValue(BigDecimal.valueOf(mapD.get(d.getCode()).getLimitRate()).setScale(2, RoundingMode.HALF_UP)); } else { @@ -2090,7 +2222,8 @@ public class DimGlobalDealServiceImpl implements DimGlobalDealService { for (Dept d : deptList) { DimGlobalDataVO dimGlobalDataVO = new DimGlobalDataVO(); dimGlobalDataVO.setValue(BigDecimal.valueOf(3.14159)); - dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgName(d.getName()); + dimGlobalDataVO.setOrgId(d.getCode()); resultList.add(dimGlobalDataVO); } }