去掉生成报告事务控制

src/main/java/com/persagy/apm/report/dependencies/manualfilling/model/dto/QueryEnergyItemDataDTO.java

@@ -19,7 +19,7 @@ public class QueryEnergyItemDataDTO {
 
     @NotNull(message = "energyType不能为空")
     @ApiModelProperty(value = "能耗类型编码", required = true)
-    private String energyType;
+    private Integer energyType;
 
     @NotNull(message = "functionType不能为空")
     @ApiModelProperty(value = "信息点类型（0-能耗，1-费用 ，2-能耗预算，3-费用预算）", required = true)

src/main/java/com/persagy/apm/report/dependencies/manualfilling/service/impl/IEnergyItemDataServiceImpl.java

@@ -62,6 +62,7 @@ public class IEnergyItemDataServiceImpl implements IEnergyItemDataService {
             // 查询分项的值
             QueryManualFillingDataDTO queryManualFillingDataDTO = new QueryManualFillingDataDTO();
             queryManualFillingDataDTO.setFunctionIds(functionIdList);
+            queryManualFillingDataDTO.setType(queryEnergyItemDataDTO.getFunctionType());
             queryManualFillingDataDTO.setProjectId(queryEnergyItemDataDTO.getProjectId());
             queryManualFillingDataDTO.setStartTime(
                     DateUtils.str2Date(queryEnergyItemDataDTO.getStartDate(), DateUtils.SDF_SECOND));

src/main/java/com/persagy/apm/report/outline/service/builder/impl/ReportGenerator.java

@@ -44,7 +44,7 @@ public class ReportGenerator implements IReportGenerator {
 //    private ReportGenerator reportGenerator;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public void generateReport(ReportOutline reportOutline) {
         // 删除之前生成的段落
         deleteReportParagraphs(reportOutline);
@@ -63,7 +63,7 @@ public class ReportGenerator implements IReportGenerator {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.NESTED)
+//    @Transactional(rollbackFor = Exception.class, propagation = Propagation.NESTED)
     public boolean generateParagraphs(ReportOutline reportOutline) {
         String reportTypeId = reportOutline.getReportTypeId();
         ReportType reportType = reportTypeService.queryReportTypeDetail(reportTypeId);
@@ -82,7 +82,7 @@ public class ReportGenerator implements IReportGenerator {
             IParagraphBuilder paragraphBuilder = SpringUtil.getBean(modelCode + "Builder");
             if (paragraphBuilder == null) {
                 log.error("目前不能生成模板编码为：{}的段落", modelCode);
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return false;
             }
             paragraphBuilder.saveParagraphValue(paragraph, reportOutline);