浏览代码

生成报告代码开发

lixing 3 年之前
父节点
当前提交
7c47324f19

+ 1 - 3
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/BusinessReportCostInfoServiceImpl.java

@@ -108,9 +108,7 @@ public class BusinessReportCostInfoServiceImpl implements com.persagy.apm.energy
 
         for (String functionId : functionIdList) {
             Function function = functionService.queryFunctionDetail(functionId);
-            // TODO: 2021/5/31 移除注释
-            //            String itemName = functionService.getItemName(function, projectIds.get(0));
-            String itemName = "test";
+            String itemName = functionService.getItemName(function, projectIds.get(0));
 
             List<CostItemVO> projectCostItems = getCostItemsByProjects(reportMonth, projectIds, function);
             CostItemVO costSumByProjects = getCostSum(projectCostItems);

+ 8 - 11
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/BusinessReportPowerInfoServiceImpl.java

@@ -106,9 +106,7 @@ public class BusinessReportPowerInfoServiceImpl implements com.persagy.apm.energ
 
         for (String functionId : functionIdList) {
             Function function = functionService.queryFunctionDetail(functionId);
-            // TODO: 2021/5/31 解除注释
-//            String itemName = functionService.getItemName(function, projectIds.get(0));
-            String itemName = "test";
+            String itemName = functionService.getItemName(function, projectIds.get(0));
 
             List<PowerItemVO> projectPowerItems = getPowerItemsByProjects(reportMonth, projectIds, function);
             PowerItemVO powerSumByProjects = getPowerSum(projectPowerItems);
@@ -134,14 +132,13 @@ public class BusinessReportPowerInfoServiceImpl implements com.persagy.apm.energ
             if (reportProjectInfo == null) {
                 continue;
             }
-            // TODO: 2021/5/31 解除注释
-//            Map<String, TreeMap<Date, Double>> itemEnergyDataMap = getItemEnergyDataMap(
-//                    reportMonth, function.getItemId(), function.getModelCode(), reportProjectInfo.getProjectLocalID());
-//            TreeMap<Date, Double> dateValueMap = itemEnergyDataMap.get(function.getItemId());
-//            if (dateValueMap != null) {
-//                PowerItemVO powerItemInfo = getPowerItemInfo(reportMonth, totalCommercialArea, dateValueMap);
-//                projectPowerItems.add(powerItemInfo);
-//            }
+            Map<String, TreeMap<Date, Double>> itemEnergyDataMap = getItemEnergyDataMap(
+                    reportMonth, function.getItemId(), function.getModelCode(), reportProjectInfo.getProjectLocalID());
+            TreeMap<Date, Double> dateValueMap = itemEnergyDataMap.get(function.getItemId());
+            if (dateValueMap != null) {
+                PowerItemVO powerItemInfo = getPowerItemInfo(reportMonth, totalCommercialArea, dateValueMap);
+                projectPowerItems.add(powerItemInfo);
+            }
         }
         return projectPowerItems;
     }

+ 3 - 8
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineServiceImpl.java

@@ -259,7 +259,6 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
 
         if (queryReportOutlineDTO != null) {
 
-            // todo 需判断使用like还是eq
             if (StringUtils.isNotEmpty(queryReportOutlineDTO.getName())) {
                 queryWrapper.like(ReportOutline.PROP_NAME, queryReportOutlineDTO.getName());
             }
@@ -268,19 +267,16 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
                 queryWrapper.eq(ReportOutline.PROP_REPORT_MONTH, queryReportOutlineDTO.getDate());
             }
 
-            // todo 需判断使用like还是eq
             if (StringUtils.isNotEmpty(queryReportOutlineDTO.getBelong())) {
-                queryWrapper.like(ReportOutline.PROP_BELONG, queryReportOutlineDTO.getBelong());
+                queryWrapper.eq(ReportOutline.PROP_BELONG, queryReportOutlineDTO.getBelong());
             }
 
-            // todo 需判断使用like还是eq
             if (StringUtils.isNotEmpty(queryReportOutlineDTO.getType())) {
-                queryWrapper.like(ReportOutline.PROP_REPORT_TYPE_ID, queryReportOutlineDTO.getType());
+                queryWrapper.eq(ReportOutline.PROP_REPORT_TYPE_ID, queryReportOutlineDTO.getType());
             }
 
-            // todo 需判断使用like还是eq
             if (StringUtils.isNotEmpty(queryReportOutlineDTO.getDetailId())) {
-                queryWrapper.like(ReportOutline.PROP_DETAIL_ID, queryReportOutlineDTO.getDetailId());
+                queryWrapper.eq(ReportOutline.PROP_DETAIL_ID, queryReportOutlineDTO.getDetailId());
             }
 
             if (queryReportOutlineDTO.getStatus() != null) {
@@ -322,7 +318,6 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
             }
         }
 
-        // todo 需判断使用like还是eq
         if (StringUtils.isNotEmpty(pageQueryReportOutlineDTO.getName())) {
             queryWrapper.like(ReportOutline.PROP_NAME, pageQueryReportOutlineDTO.getName());
         }

+ 1 - 0
src/main/java/com/persagy/apm/energy/report/saasweb/service/impl/SaasWebServiceImpl.java

@@ -43,6 +43,7 @@ public class SaasWebServiceImpl implements ISaasWebService {
         if (simpleProjectVO != null) {
             reportProjectVO.setProjectName(simpleProjectVO.getProjectName());
             reportProjectVO.setFunctionType(simpleProjectVO.getFunctionType());
+            reportProjectVO.setProjectLocalID(simpleProjectVO.getProjectLocalID());
             // 获取项目下建筑的面积总和
             ReportProjectVO projectAreas = getProjectAreas(projectId);
             reportProjectVO.setCommercialArea(projectAreas.getCommercialArea());