|
@@ -68,14 +68,14 @@ public class PhotovoltaicServiceImpl implements PhotovoltaicService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public ReturnMsg getPhotovoltaicInfo(IocParam iocParam) {
|
|
public ReturnMsg getPhotovoltaicInfo(IocParam iocParam) {
|
|
- String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
|
|
|
|
|
|
+ /* String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
|
|
String startStr = iocParam.getTimeRange().getStartDate();
|
|
String startStr = iocParam.getTimeRange().getStartDate();
|
|
String endStr = iocParam.getTimeRange().getEndDate();
|
|
String endStr = iocParam.getTimeRange().getEndDate();
|
|
List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
|
|
List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
|
|
String[] labKey = lists.toArray(new String[0]);
|
|
String[] labKey = lists.toArray(new String[0]);
|
|
List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
- return ReturnMsg.ok(labels1);
|
|
|
|
- /* Company company = companyMapper.selectById(1);
|
|
|
|
|
|
+ return ReturnMsg.ok(labels1);*/
|
|
|
|
+ Company company = companyMapper.selectById(1);
|
|
Department department = departmentMapper.selectById(company.getOfficeId());
|
|
Department department = departmentMapper.selectById(company.getOfficeId());
|
|
List<Department> departments =departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getParentId,department.getOriId()));
|
|
List<Department> departments =departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getParentId,department.getOriId()));
|
|
String[] param = departments.stream().map(Department::getName).collect(Collectors.toList()).toArray(new String[0]);
|
|
String[] param = departments.stream().map(Department::getName).collect(Collectors.toList()).toArray(new String[0]);
|
|
@@ -102,7 +102,7 @@ public class PhotovoltaicServiceImpl implements PhotovoltaicService {
|
|
labels1.add(label);
|
|
labels1.add(label);
|
|
}
|
|
}
|
|
// List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
// List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
- return ReturnMsg.ok(labels1);*/
|
|
|
|
|
|
+ return ReturnMsg.ok(labels1);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|