From 8d8c6d344f69ae0e204d36b4bd5b15e12c486615 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Fri, 7 Jul 2023 11:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/mysql/Impl/area/RStatHarmonicServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java index 7ff6bd147..f2cdbe5f6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java @@ -75,7 +75,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { // this.hanlderOracleQtr (lineParam); // break; case 3: - this.hanlderOracleM ( data, dataDate, type); + this.hanlderM ( data, dataDate, type); break; case 5: this.hanlderDay ( data, dataDate, type); @@ -87,7 +87,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { @Transactional @Async("asyncExecutor") @SneakyThrows - private void hanlderOracleM(List data, String dataDate, Integer type) { + private void hanlderM(List data, String dataDate, Integer type) { List rStatHarmonicMPOList = new ArrayList<>(); Date date = DateUtil.parse(dataDate); @@ -132,7 +132,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { List rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper); rStatOrgMPOQueryWrapper.clear(); - rStatOrgMPOQueryWrapper.select("effective_measurement"). + rStatOrgMPOQueryWrapper.select("effective_measurement_accrued"). eq("org_no", deptGetChildrenMoreDTO.getUnitId()). eq("measurement_type_class", getmeasurementType(k, lineSortMap)). eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()). @@ -207,7 +207,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { List rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper); rStatOrgMPOQueryWrapper.clear(); - rStatOrgMPOQueryWrapper.select("effective_measurement"). + rStatOrgMPOQueryWrapper.select("effective_measurement_accrued"). eq("org_no", deptGetChildrenMoreDTO.getUnitId()). eq("measurement_type_class", getmeasurementType(k, lineSortMap)). eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).