Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

提交

Browse Source
This commit is contained in:
huangzj
2023-07-07 11:04:36 +08:00
parent 5229ae3c60
commit 8d8c6d344f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
// this.hanlderOracleQtr (lineParam); // this.hanlderOracleQtr (lineParam);
// break; // break;
case 3: case 3:
this.hanlderOracleM ( data, dataDate, type); this.hanlderM ( data, dataDate, type);
break; break;
case 5: case 5:
this.hanlderDay ( data, dataDate, type); this.hanlderDay ( data, dataDate, type);
@@ -87,7 +87,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
@Transactional @Transactional
@Async("asyncExecutor") @Async("asyncExecutor")
@SneakyThrows @SneakyThrows
private void hanlderOracleM(List<DeptGetChildrenMoreDTO> data, String dataDate, Integer type) { private void hanlderM(List<DeptGetChildrenMoreDTO> data, String dataDate, Integer type) {
List<RStatHarmonicMPO> rStatHarmonicMPOList = new ArrayList<>(); List<RStatHarmonicMPO> rStatHarmonicMPOList = new ArrayList<>();
Date date = DateUtil.parse(dataDate); Date date = DateUtil.parse(dataDate);
@@ -132,7 +132,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
List<RMpSurplusHarmonicDetailM> rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper); List<RMpSurplusHarmonicDetailM> rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper);
rStatOrgMPOQueryWrapper.clear(); rStatOrgMPOQueryWrapper.clear();
rStatOrgMPOQueryWrapper.select("effective_measurement"). rStatOrgMPOQueryWrapper.select("effective_measurement_accrued").
eq("org_no", deptGetChildrenMoreDTO.getUnitId()). eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
eq("measurement_type_class", getmeasurementType(k, lineSortMap)). eq("measurement_type_class", getmeasurementType(k, lineSortMap)).
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()). eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).
@@ -207,7 +207,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
List<RMpSurplusHarmonicDetailM> rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper); List<RMpSurplusHarmonicDetailM> rMpSurplusHarmonicDetailMS = rMpSurplusHarmonicDetailMMapper.selectList(rMpSurplusHarmonicDetailMQueryWrapper);
rStatOrgMPOQueryWrapper.clear(); rStatOrgMPOQueryWrapper.clear();
rStatOrgMPOQueryWrapper.select("effective_measurement"). rStatOrgMPOQueryWrapper.select("effective_measurement_accrued").
eq("org_no", deptGetChildrenMoreDTO.getUnitId()). eq("org_no", deptGetChildrenMoreDTO.getUnitId()).
eq("measurement_type_class", getmeasurementType(k, lineSortMap)). eq("measurement_type_class", getmeasurementType(k, lineSortMap)).
eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()). eq("data_type", dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()).