|
@@ -117,7 +117,7 @@ public class ReportsComputeServiceImpl implements ReportsComputeService {
|
|
List<Long> sids = ss.stream().map(c -> c.getProjectId()).collect(Collectors.toList());
|
|
List<Long> sids = ss.stream().map(c -> c.getProjectId()).collect(Collectors.toList());
|
|
req.setStopingProjectIds(sids);
|
|
req.setStopingProjectIds(sids);
|
|
}
|
|
}
|
|
- if(req.getComputingProjectIds()!=null||req.getStopingProjectIds()!=null) {
|
|
|
|
|
|
+ if (req.getComputingProjectIds() != null || req.getStopingProjectIds() != null) {
|
|
projectCloudService.updateProjectStatusByIds(req);
|
|
projectCloudService.updateProjectStatusByIds(req);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -506,13 +506,16 @@ public class ReportsComputeServiceImpl implements ReportsComputeService {
|
|
private void addPartitionData(Double score, ProjectInfoBean pro, List<Long> partitionData) {
|
|
private void addPartitionData(Double score, ProjectInfoBean pro, List<Long> partitionData) {
|
|
List<Double> partitionDetails = pro.getPartitionDetails();
|
|
List<Double> partitionDetails = pro.getPartitionDetails();
|
|
for (int i = 0; i < partitionDetails.size(); i++) {
|
|
for (int i = 0; i < partitionDetails.size(); i++) {
|
|
- if (i == 0) {
|
|
|
|
- if (score < partitionDetails.get(i)) {
|
|
|
|
- partitionData.set(i, partitionData.get(i) + 1);
|
|
|
|
|
|
+ if (i == 0 || i == partitionDetails.size() - 1) {
|
|
|
|
+ if (i == 0) {
|
|
|
|
+ if (score < partitionDetails.get(i)) {
|
|
|
|
+ partitionData.set(i, partitionData.get(i) + 1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- } else if (i == partitionDetails.size() - 1) {
|
|
|
|
- if (partitionDetails.get(i) <= score && score <= pro.getTotalScore()) {
|
|
|
|
- partitionData.set(i, partitionData.get(i) + 1);
|
|
|
|
|
|
+ if (i == partitionDetails.size() - 1) {
|
|
|
|
+ if (partitionDetails.get(i) <= score && score <= pro.getTotalScore()) {
|
|
|
|
+ partitionData.set(i+1, partitionData.get(i+1) + 1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (partitionDetails.get(i - 1) <= score && score < partitionDetails.get(i)) {
|
|
if (partitionDetails.get(i - 1) <= score && score < partitionDetails.get(i)) {
|
|
@@ -788,10 +791,10 @@ public class ReportsComputeServiceImpl implements ReportsComputeService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<ReportsComputeBean> getList(List<Long> pids, Long rootOrgId) {
|
|
public List<ReportsComputeBean> getList(List<Long> pids, Long rootOrgId) {
|
|
- List<ReportsComputeBean> ret=new ArrayList<ReportsComputeBean>();
|
|
|
|
- List<ReportsComputeEntity> list=reportsComputeRepo.getByIds(pids, rootOrgId);
|
|
|
|
- if(list!=null) {
|
|
|
|
- for(ReportsComputeEntity pe:list) {
|
|
|
|
|
|
+ List<ReportsComputeBean> ret = new ArrayList<ReportsComputeBean>();
|
|
|
|
+ List<ReportsComputeEntity> list = reportsComputeRepo.getByIds(pids, rootOrgId);
|
|
|
|
+ if (list != null) {
|
|
|
|
+ for (ReportsComputeEntity pe : list) {
|
|
ReportsComputeBean bean = new ReportsComputeBean();
|
|
ReportsComputeBean bean = new ReportsComputeBean();
|
|
BeanUtils.copyProperties(pe, bean);
|
|
BeanUtils.copyProperties(pe, bean);
|
|
bean.setStatusName(bean.getStatus().getDesc());
|
|
bean.setStatusName(bean.getStatus().getDesc());
|