|
@@ -89,7 +89,8 @@ public class AnnualInspectionDataService {
|
|
|
//封装台量
|
|
|
projectAnnualList.forEach(annualInspectionDataModel -> {
|
|
|
if (projectIdToLiftNum != null && projectIdToLiftNum.size() > 0) {
|
|
|
- annualInspectionDataModel.setUnitNum(projectIdToLiftNum.get(annualInspectionDataModel.getProjectId()));
|
|
|
+ annualInspectionDataModel.setUnitNum(DataStatisticsUtil.getLongValue(
|
|
|
+ projectIdToLiftNum.get(annualInspectionDataModel.getProjectId())));
|
|
|
}
|
|
|
});
|
|
|
return RestResponse.success(projectAnnualList, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
|
|
@@ -102,6 +103,7 @@ public class AnnualInspectionDataService {
|
|
|
* @date 2020/5/23 10:02 上午
|
|
|
*/
|
|
|
public RestResponse liftAnnualInfo(AnnualInspectionDataRequest annualInspectionDataRequest) {
|
|
|
+ DataStatisticsUtil.initCommonRequest(annualInspectionDataRequest);
|
|
|
List<AnnualInspectionDataModel> liftAnnualList = annualInspectionDataMapper
|
|
|
.getProjectLiftAnnualInfo(annualInspectionDataRequest);
|
|
|
return RestResponse.success(liftAnnualList);
|