议题附表

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

@@ -36,7 +36,6 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-@DataSource(DataSourceConstant.STATS)
 public class IssueExtractServiceImpl implements IssueExtractService {
 
     @Autowired
@@ -166,12 +165,19 @@ public class IssueExtractServiceImpl implements IssueExtractService {
             });
         }
 
+        // 上级ID
         List<String> agencyIds = listResult.stream().map(process -> process.getAgencyId()).distinct().collect(Collectors.toList());
         List<AgencyInfoResultDTO> agencyInfoList = dimAgencyDao.selectAgencyInfo(agencyIds);
         if (CollectionUtils.isEmpty(agencyInfoList)){
             throw new RenException("查询组织上级ID集合为空......");
         }
+        TimeListResultDTO timeList = DateUtils.getTimeList(dateId);
         result.forEach(r -> {
+            r.setDateId(dateId);
+            r.setWeekId(timeList.getWeekId());
+            r.setMonthId(timeList.getMonthId());
+            r.setQuarterId(timeList.getQuarterId());
+            r.setYearId(timeList.getYearId());
             agencyInfoList.forEach(agency -> {
                 if (r.getAgencyId().equals(agency.getAgencyId())){
                     r.setPid(agency.getPid());