Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java

@@ -121,9 +121,13 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             if(StringUtils.isNotBlank(param.getDateId())){
                 try {
                     issueExtractService.issueExtractMain(param);
+                } catch (Exception e) {
+                    log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(param), e);
+                }
+                try {
                     issueExtractService.issueExtractLog(param);
                 } catch (Exception e) {
-                    log.error("抽取【议题数据】发生异常,参数:" + JSON.toJSONString(param), e);
+                    log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(param), e);
                 }
             }else if(StringUtils.isNotBlank(param.getStartDate()) && StringUtils.isNotBlank(param.getEndDate())){
                 try {
@@ -132,10 +136,19 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                         String dateDimId = daysBetween.get(i);
                         param.setDateId(dateDimId);
                         issueExtractService.issueExtractMain(param);
+                    }
+                } catch (Exception e) {
+                    log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(param), e);
+                }
+                try {
+                    List<String> daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
+                    for (int i = 0; i < daysBetween.size(); i++) {
+                        String dateDimId = daysBetween.get(i);
+                        param.setDateId(dateDimId);
                         issueExtractService.issueExtractLog(param);
                     }
                 } catch (Exception e) {
-                    log.error("抽取【议题数据】发生异常,参数:" + JSON.toJSONString(param), e);
+                    log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(param), e);
                 }
             }
         });
@@ -143,6 +156,10 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             if(StringUtils.isNotBlank(param.getDateId())){
                 try {
                     projectExtractService.saveOriginProjectDaily(param);
+                } catch (Exception e) {
+                    log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(param), e);
+                }
+                try {
                     projectExtractService.extractProjectPeriodData(param);
                 } catch (Exception e) {
                     log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(param), e);
@@ -154,6 +171,15 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                         String dateDimId = daysBetween.get(i);
                         param.setDateId(dateDimId);
                         projectExtractService.saveOriginProjectDaily(param);
+                    }
+                } catch (Exception e) {
+                    log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(param), e);
+                }
+                try {
+                    List<String> daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
+                    for (int i = 0; i < daysBetween.size(); i++) {
+                        String dateDimId = daysBetween.get(i);
+                        param.setDateId(dateDimId);
                         projectExtractService.extractProjectPeriodData(param);
                     }
                 } catch (Exception e) {