提交
This commit is contained in:
@@ -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<DeptGetChildrenMoreDTO> data, String dataDate, Integer type) {
|
||||
private void hanlderM(List<DeptGetChildrenMoreDTO> data, String dataDate, Integer type) {
|
||||
|
||||
List<RStatHarmonicMPO> rStatHarmonicMPOList = new ArrayList<>();
|
||||
Date date = DateUtil.parse(dataDate);
|
||||
@@ -132,7 +132,7 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService {
|
||||
List<RMpSurplusHarmonicDetailM> 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<RMpSurplusHarmonicDetailM> 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()).
|
||||
|
||||
Reference in New Issue
Block a user