|
|
@ -1,5 +1,6 @@ |
|
|
|
package com.epmet.datareport.service.fact.impl; |
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.epmet.commons.dynamic.datasource.annotation.DataSource; |
|
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
@ -12,6 +13,7 @@ import com.epmet.datareport.dao.fact.*; |
|
|
|
import com.epmet.datareport.service.fact.FactIndexService; |
|
|
|
import com.epmet.evaluationindex.screen.dto.form.*; |
|
|
|
import com.epmet.evaluationindex.screen.dto.result.*; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
@ -29,6 +31,7 @@ import java.util.regex.Pattern; |
|
|
|
* |
|
|
|
* @author sun |
|
|
|
*/ |
|
|
|
@Slf4j |
|
|
|
@Service |
|
|
|
@DataSource(DataSourceConstant.EVALUATION_INDEX) |
|
|
|
public class FactIndexServiceImpl implements FactIndexService { |
|
|
@ -246,7 +249,7 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
} else { |
|
|
|
throw new RenException(String.format("能力指数查询,orgType类型错误,组织Id:%s,类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType())); |
|
|
|
} |
|
|
|
|
|
|
|
log.debug("monthScoreList search result:{}", JSON.toJSONString(list)); |
|
|
|
//5.封装数据并返回
|
|
|
|
for (MonthScoreListResultDTO.ScoreListResultDTO l : list) { |
|
|
|
if (FactConstant.DJNL.equals(l.getIndexCode())) { |
|
|
@ -275,7 +278,7 @@ public class FactIndexServiceImpl implements FactIndexService { |
|
|
|
if (null != fwList) { |
|
|
|
resultList.add(fw); |
|
|
|
} |
|
|
|
|
|
|
|
log.debug("monthScoreList search return result:{}", JSON.toJSONString(resultList)); |
|
|
|
return resultList; |
|
|
|
} |
|
|
|
|
|
|
|