河北pms两级文档需求开发
This commit is contained in:
@@ -19,9 +19,7 @@ import com.njcn.harmonic.pojo.dto.upload.PqEvaluationCreateDTO;
|
||||
import com.njcn.harmonic.pojo.param.UploadDataParam;
|
||||
import com.njcn.harmonic.pojo.param.UploadParam;
|
||||
import com.njcn.harmonic.pojo.param.upload.DimBusBarParam;
|
||||
import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD;
|
||||
import com.njcn.harmonic.pojo.po.upload.RDimBusUpD;
|
||||
import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD;
|
||||
import com.njcn.harmonic.pojo.po.upload.*;
|
||||
import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO;
|
||||
import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
|
||||
import com.njcn.harmonic.service.upload.IEvaluationDataService;
|
||||
@@ -36,6 +34,7 @@ import com.njcn.web.utils.GwSendUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections4.ListUtils;
|
||||
import org.apache.poi.ss.formula.functions.T;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
@@ -209,29 +208,53 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
|
||||
if (StrUtil.isNotBlank(param.getIndexType())) {
|
||||
QueryWrapper<RDimBusUpD> queryWrapper = new QueryWrapper<>();
|
||||
this.harmTarget(param, queryWrapper);
|
||||
queryWrapper.eq("statistic_date", day);
|
||||
queryWrapper.eq("statistic_date", day).eq("stat_date",param.getStatDate());
|
||||
List<RDimBusUpD> rDimBusUpDList = rDimBusUpDMapper.selectList(queryWrapper);
|
||||
if (CollectionUtil.isEmpty(rDimBusUpDList)) {
|
||||
return new Page<>();
|
||||
}
|
||||
temBusIds = rDimBusUpDList.stream().map(RDimBusUpD::getMidBusId).distinct().collect(Collectors.toList());
|
||||
}
|
||||
param.setOnlineBusIds(temBusIds);
|
||||
|
||||
|
||||
} else if (param.getStatType().equals("02")) {
|
||||
LocalDate monthBegin = LocalDate.parse(param.getStartTime());
|
||||
//具体日期投运,监测台账查询
|
||||
LambdaQueryWrapper<PmsRunStatisticM> dayLam = new LambdaQueryWrapper<>();
|
||||
dayLam.eq(PmsRunStatisticM::getStatisticDate, monthBegin).in(PmsRunStatisticM::getDeptId, param.getNodeId()).eq(PmsRunStatisticM::getStatDate,param.getStatDate());
|
||||
PmsRunStatisticM pmsRunStatisticM = pmsRunStatisticMMapper.selectOne(dayLam);
|
||||
if (Objects.nonNull(pmsRunStatisticM)) {
|
||||
if (StrUtil.isNotBlank(param.getDataSource())) {
|
||||
temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticM.getOnlineBusMidIds().split(StrUtil.COMMA)));
|
||||
} else {
|
||||
temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticM.getRunBusIds().split(StrUtil.COMMA)));
|
||||
}
|
||||
}
|
||||
|
||||
//稳态指标条件筛选
|
||||
if (StrUtil.isNotBlank(param.getIndexType())) {
|
||||
QueryWrapper<RDimBusUpM> queryWrapper = new QueryWrapper<>();
|
||||
this.harmTarget(param, queryWrapper);
|
||||
queryWrapper.eq("statistic_date", monthBegin);
|
||||
List<RDimBusUpM> rDimBusUpMList = rDimBusUpMMapper.selectList(queryWrapper);
|
||||
if (CollectionUtil.isEmpty(rDimBusUpMList)) {
|
||||
return new Page<>();
|
||||
}
|
||||
temBusIds = rDimBusUpMList.stream().map(RDimBusUpM::getMidBusId).distinct().collect(Collectors.toList());
|
||||
}
|
||||
|
||||
} else if (param.getStatType().equals("01")) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
param.setOnlineBusIds(temBusIds);
|
||||
if (CollectionUtil.isEmpty(temBusIds)) {
|
||||
return new Page<>();
|
||||
}
|
||||
return this.baseMapper.getBaseEvaOnlineBusDetail(new Page<>(param.getPageNum(), param.getPageSize()), param);
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void harmTarget(DimBusBarParam param, QueryWrapper<RDimBusUpD> queryWrapper) {
|
||||
private void harmTarget(DimBusBarParam param, QueryWrapper queryWrapper) {
|
||||
//稳态指标条件筛选
|
||||
String target = "", harmV = "";
|
||||
switch (param.getIndexType()) {
|
||||
|
||||
Reference in New Issue
Block a user