elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

查询接口调整

dev_shibei_match
sunyuchao 5 years ago
parent
a1c1e59d9d
commit
e8a6d7b0ea
12 changed files with 128 additions and 167 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AblityIndexFormDTO.java
  2. 6
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthScoreListFormDTO.java
  3. 6
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScoreListFormDTO.java
  4. 10
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityIndexResultDTO.java
  5. 6
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthScoreListResultDTO.java
  6. 5
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencyScoreDao.java
  7. 5
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunityScoreDao.java
  8. 3
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridScoreDao.java
  9. 176
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
  10. 14
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml
  11. 14
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml
  12. 14
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml

6
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AblityIndexFormDTO.java
View File

@ -13,6 +13,7 @@ import java.io.Serializable;
@Data
public class AblityIndexFormDTO implements Serializable {
private static final long serialVersionUID = -2880432640584616651L;
public interface AddUserInternalGroup {}
/**
* 组织或网格Id
*/
@ -37,10 +38,5 @@ public class AblityIndexFormDTO implements Serializable {
*/
@NotBlank(message = "月份ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
private String monthId;
/**
* 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
*/
private String indexCode;
public interface AddUserInternalGroup {}
}

6
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthScoreListFormDTO.java
View File

@ -13,6 +13,7 @@ import java.io.Serializable;
@Data
public class MonthScoreListFormDTO implements Serializable {
private static final long serialVersionUID = -2880432640584616651L;
public interface AddUserInternalGroup {}
/**
* 组织或网格Id
*/
@ -28,10 +29,6 @@ public class MonthScoreListFormDTO implements Serializable {
*/
@NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
private String orgType;
/**
* 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
*/
private String indexCode;
/**
* 月份Id（格式：202009）
*/
@ -41,6 +38,5 @@ public class MonthScoreListFormDTO implements Serializable {
* 查询月份的前12个月对应的monthId
*/
private String startMonthId;
public interface AddUserInternalGroup {}
}

6
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScoreListFormDTO.java
View File

@ -13,6 +13,7 @@ import java.io.Serializable;
@Data
public class ScoreListFormDTO implements Serializable {
private static final long serialVersionUID = -2880432640584616651L;
public interface AddUserInternalGroup {}
/**
* 组织或网格Id
*/
@ -28,15 +29,10 @@ public class ScoreListFormDTO implements Serializable {
*/
@NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
private String orgType;
public interface AddUserInternalGroup {}
/**
* 月份Id（格式：202009）
*/
@NotBlank(message = "月份ID不能为空",groups = {ScoreListFormDTO.AddUserInternalGroup.class})
private String monthId;
/**
* 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
*/
private String indexCode;
}

10
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityIndexResultDTO.java
View File

@ -1,5 +1,6 @@
package com.epmet.evaluationindex.screen.dto.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -33,11 +34,12 @@ public class AblityIndexResultDTO implements Serializable {
* 横坐标（202009）
*/
private String monthId;
/**
* 能力类型 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；
*/
@JsonIgnore
private String indexCode;
}
}

6
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthScoreListResultDTO.java
View File

@ -1,5 +1,6 @@
package com.epmet.evaluationindex.screen.dto.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -41,6 +42,11 @@ public class MonthScoreListResultDTO implements Serializable {
* 横坐标（202009）
*/
private String monthId;
/**
* 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
*/
@JsonIgnore
private String indexCode;
}

5
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencyScoreDao.java
View File

@ -26,6 +26,7 @@ import com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.LinkedList;
import java.util.List;
/**
* 区/街道相关分数表
@ -45,10 +46,10 @@ public interface FactIndexAgencyScoreDao {
/**
* @param formDTO
* @Description 分别查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
* @Description 查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
* @author sun
*/
ScoreListResultDTO selectScoreList(ScoreListFormDTO formDTO);
List<ScoreListResultDTO> selectScoreList(ScoreListFormDTO formDTO);
/**
* @param formDTO

5
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunityScoreDao.java
View File

@ -26,6 +26,7 @@ import com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.LinkedList;
import java.util.List;
/**
* 社区相关分数表
@ -45,10 +46,10 @@ public interface FactIndexCommunityScoreDao {
/**
* @param formDTO
* @Description 分别查询社区级组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
* @Description 查询社区级组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
* @author sun
*/
ScoreListResultDTO selectCommunityScoreList(ScoreListFormDTO formDTO);
List<ScoreListResultDTO> selectCommunityScoreList(ScoreListFormDTO formDTO);
/**
* @param formDTO

3
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridScoreDao.java
View File

@ -26,6 +26,7 @@ import com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.LinkedList;
import java.util.List;
/**
* 网格相关分值记录表
@ -48,7 +49,7 @@ public interface FactIndexGridScoreDao {
* @Description 分别查网格某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
* @author sun
*/
ScoreListResultDTO selectGridScoreList(ScoreListFormDTO formDTO);
List<ScoreListResultDTO> selectGridScoreList(ScoreListFormDTO formDTO);
/**
* @param formDTO

176
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
View File

@ -15,10 +15,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.NumberFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
import java.util.regex.Pattern;
/**
@ -57,9 +59,10 @@ public class FactIndexServiceImpl implements FactIndexService {
@Override
public List<AblityIndexResultDTO> ablityIndex(AblityIndexFormDTO formDTO) {
LinkedList<AblityIndexResultDTO> resultList = new LinkedList<>();
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> djList = null;
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> zlList = null;
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> fwList = null;
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> list = new LinkedList<>();
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> djList = new LinkedList<>();
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> zlList = new LinkedList<>();
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> fwList = new LinkedList<>();
//1.计算所查月份前12个月的monthId
formDTO.setStartMonthId(getDate(formDTO.getMonthId()));
//2.根据类型判断是查询组织数据还是网格数据
@ -73,60 +76,59 @@ public class FactIndexServiceImpl implements FactIndexService {
//4.根据组织级别判断查询哪类数据表
//区县级、乡镇街道级
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
//4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据(不想写union)
formDTO.setIndexCode(FactConstant.DJNL);
djList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
//4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.ZLNL);
zlList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
//4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.FWNL);
fwList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分数据
list = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
//社区级
} else if ("community".equals(agency.getLevel())) {
//4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.DJNL);
djList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
//4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.ZLNL);
zlList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
//4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.FWNL);
fwList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
list = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
} else {
throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
}
//网格层级数据
} else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
//5.查询过去12个月网格层级各项能力对应的各项得分数据
//5-1.查询网格过去12个月党建能力每月总分、本级得分、下级得分数据(不想写union)
formDTO.setIndexCode(FactConstant.DJNL);
djList = factIndexGridScoreDao.selectGridAblityIndex(formDTO);
//5-2.查询网格过去12个月治理能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.ZLNL);
zlList = factIndexGridScoreDao.selectGridAblityIndex(formDTO);
//5-3.查询网格过去12个月服务能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.FWNL);
fwList = factIndexGridScoreDao.selectGridAblityIndex(formDTO);
//5.查询网格过去12个月党建能力、治理能力、服务能力每月总分数据
list = factIndexGridScoreDao.selectGridAblityIndex(formDTO);
} else {
throw new RenException(String.format("能力指数查询,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
}
if(djList.size()!=zlList.size()||djList.size()!=fwList.size()){
throw new RenException(String.format("能力指数查询,查询出来的三大能力数据条数不一致，orgId:%s，orgType:%s，monthId:%s", formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getMonthId()));
if (list.size() < NumConstant.ONE) {
return resultList;
}
//6.遍历计算每个月能力指数
LinkedList<AblityIndexResultDTO.ScoreListResultDTO> nlList = new LinkedList<>();
for (int i = 0; i < djList.size(); i++) {
String monthId = list.get(0).getMonthId();
Double dl = 0.0;
for (AblityIndexResultDTO.ScoreListResultDTO l : list) {
if (l.getMonthId().equals(monthId)) {
dl += l.getIndexTotal();
} else {
AblityIndexResultDTO.ScoreListResultDTO nldto = new AblityIndexResultDTO.ScoreListResultDTO();
double num1 = new BigDecimal((djList.get(i).getIndexTotal() + zlList.get(i).getIndexTotal() + fwList.get(i).getIndexTotal())).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
double num1 = new BigDecimal(dl).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
nldto.setIndexTotal(num1);
nldto.setMonthId(djList.get(i).getMonthId());
nldto.setMonthId(monthId);
nlList.add(nldto);
monthId = l.getMonthId();
dl = l.getIndexTotal();
}
//5.封装数据并返回
if (FactConstant.DJNL.equals(l.getIndexCode())) {
djList.add(l);
} else if (FactConstant.ZLNL.equals(l.getIndexCode())) {
zlList.add(l);
} else if (FactConstant.FWNL.equals(l.getIndexCode())) {
fwList.add(l);
}
}
//把最后一个月的能力指标数据放入集合
AblityIndexResultDTO.ScoreListResultDTO nldto = new AblityIndexResultDTO.ScoreListResultDTO();
double num1 = new BigDecimal(dl).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
nldto.setIndexTotal(num1);
nldto.setMonthId(monthId);
nlList.add(nldto);
//7.封装数据并返回
AblityIndexResultDTO nl = new AblityIndexResultDTO();
nl.setIndexCode(FactConstant.NLZB);
nl.setScoreList(nlList);
@ -162,10 +164,7 @@ public class FactIndexServiceImpl implements FactIndexService {
*/
@Override
public List<ScoreListResultDTO> scoreList(ScoreListFormDTO formDTO) {
LinkedList<ScoreListResultDTO> resultList = new LinkedList<>();
ScoreListResultDTO dj = new ScoreListResultDTO();
ScoreListResultDTO zl = new ScoreListResultDTO();
ScoreListResultDTO fw = new ScoreListResultDTO();
List<ScoreListResultDTO> resultList = new LinkedList<>();
//1.根据类型判断是查询组织数据还是网格数据
//组织层级数据
if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
@ -177,54 +176,23 @@ public class FactIndexServiceImpl implements FactIndexService {
//3.根据组织级别判断查询哪类数据表
//区县级、乡镇街道级
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
//3-1.查询当前组织某一月份党建能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.DJNL);
dj = factIndexAgencyScoreDao.selectScoreList(formDTO);
//3-2.查询当前组织某一月份治理能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.ZLNL);
zl = factIndexAgencyScoreDao.selectScoreList(formDTO);
//3-3.查询当前组织某一月份服务能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.FWNL);
fw = factIndexAgencyScoreDao.selectScoreList(formDTO);
//3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
resultList = factIndexAgencyScoreDao.selectScoreList(formDTO);
//社区级
} else if ("community".equals(agency.getLevel())) {
//3-1.查询当前组织某一月份党建能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.DJNL);
dj = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
//3-2.查询当前组织某一月份治理能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.ZLNL);
zl = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
//3-3.查询当前组织某一月份服务能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.FWNL);
fw = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
//3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
resultList = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
} else {
throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
}
//4.网格层级数据
} else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
//4-1.查询当前组织某一月份党建能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.DJNL);
dj = factIndexGridScoreDao.selectGridScoreList(formDTO);
//4-2.查询当前组织某一月份治理能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.ZLNL);
zl = factIndexGridScoreDao.selectGridScoreList(formDTO);
//4-3.查询当前组织某一月份服务能力对应的总分、本级分、下级分
formDTO.setIndexCode(FactConstant.FWNL);
fw = factIndexGridScoreDao.selectGridScoreList(formDTO);
//4-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
resultList = factIndexGridScoreDao.selectGridScoreList(formDTO);
} else {
throw new RenException(String.format("按月份查询各项能力分数,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
}
//5.封装数据并返回
if (null != dj) {
resultList.add(dj);
}
if (null != zl) {
resultList.add(zl);
}
if (null != fw) {
resultList.add(fw);
}
return resultList;
}
@ -237,6 +205,7 @@ public class FactIndexServiceImpl implements FactIndexService {
@Override
public List<MonthScoreListResultDTO> monthScoreList(MonthScoreListFormDTO formDTO) {
LinkedList<MonthScoreListResultDTO> resultList = new LinkedList<>();
LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> list = new LinkedList<>();
LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> djList = new LinkedList<>();
LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> zlList = new LinkedList<>();
LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> fwList = new LinkedList<>();
@ -253,47 +222,34 @@ public class FactIndexServiceImpl implements FactIndexService {
//4.根据组织级别判断查询哪类数据表
//区县级、乡镇街道级
if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
//4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.DJNL);
djList = factIndexAgencyScoreDao.selectMonthScoreList(formDTO);
//4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.ZLNL);
zlList = factIndexAgencyScoreDao.selectMonthScoreList(formDTO);
//4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.FWNL);
fwList = factIndexAgencyScoreDao.selectMonthScoreList(formDTO);
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
list = factIndexAgencyScoreDao.selectMonthScoreList(formDTO);
//社区级
} else if ("community".equals(agency.getLevel())) {
//4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.DJNL);
djList = factIndexCommunityScoreDao.selectCommunityMonthScoreList(formDTO);
//4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.ZLNL);
zlList = factIndexCommunityScoreDao.selectCommunityMonthScoreList(formDTO);
//4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.FWNL);
fwList = factIndexCommunityScoreDao.selectCommunityMonthScoreList(formDTO);
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
list = factIndexCommunityScoreDao.selectCommunityMonthScoreList(formDTO);
} else {
throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
}
//网格层级数据
} else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
//5.查询过去12个月网格层级各项能力对应的各项得分数据
//5-1.查询网格过去12个月党建能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.DJNL);
djList = factIndexGridScoreDao.selectGridMonthScoreList(formDTO);
//5-2.查询网格过去12个月治理能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.ZLNL);
zlList = factIndexGridScoreDao.selectGridMonthScoreList(formDTO);
//5-3.查询网格过去12个月服务能力每月总分、本级得分、下级得分数据
formDTO.setIndexCode(FactConstant.FWNL);
fwList = factIndexGridScoreDao.selectGridMonthScoreList(formDTO);
//5.查询网格过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
list = factIndexGridScoreDao.selectGridMonthScoreList(formDTO);
} else {
throw new RenException(String.format("能力指数查询,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
}
//5.封装数据并返回
for (MonthScoreListResultDTO.ScoreListResultDTO l : list) {
if (FactConstant.DJNL.equals(l.getIndexCode())) {
djList.add(l);
} else if (FactConstant.ZLNL.equals(l.getIndexCode())) {
zlList.add(l);
} else if (FactConstant.FWNL.equals(l.getIndexCode())) {
fwList.add(l);
}
}
MonthScoreListResultDTO dj = new MonthScoreListResultDTO();
dj.setIndexCode(FactConstant.DJNL);
dj.setScoreList(djList);
@ -372,7 +328,7 @@ public class FactIndexServiceImpl implements FactIndexService {
//百分数类型，四舍五入保留小数点后一位并转成百分比
if (FactConstant.PERCENT.equals(l.getValueType())) {
BigDecimal num = new BigDecimal(result.getValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
result.setValue(num+"%");
result.setValue(num + "%");
}
});
});

14
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml
View File

@ -6,23 +6,24 @@
<select id="selectAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
SELECT
fact.month_id AS "monthId",
ROUND(fact.score, 1) AS "indexTotal"
ROUND(fact.score, 1) AS "indexTotal",
fact.index_code AS "indexCode"
FROM
fact_index_agency_score fact
WHERE
fact.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.agency_id = #{orgId}
AND fact.month_id &gt; #{startMonthId}
AND fact.month_id &lt;= #{monthId}
AND fact.index_code = #{indexCode}
ORDER BY
fact.month_id ASC
</select>
<select id="selectScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
SELECT
#{indexCode} AS "indexCode",
fact.index_code AS "indexCode",
ROUND(fact.score, 1) AS "indexTotal",
ROUND(self.self_score, 1) AS "agencyScore",
ROUND(self.sub_score, 1) AS "subAgencyScore"
@ -34,10 +35,10 @@
WHERE
fact.del_flag = '0'
AND self.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.agency_id = #{orgId}
AND fact.month_id = #{monthId}
AND fact.index_code = #{indexCode}
</select>
<select id="selectMonthScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
@ -45,7 +46,8 @@
fact.month_id AS "monthId",
ROUND(fact.score, 1) AS "indexTotal",
ROUND(self.self_score, 1) AS "agencyScore",
ROUND(self.sub_score, 1) AS "subAgencyScore"
ROUND(self.sub_score, 1) AS "subAgencyScore",
fact.index_code AS "indexCode"
FROM
fact_index_agency_score fact
INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id
@ -54,11 +56,11 @@
WHERE
fact.del_flag = '0'
AND self.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.agency_id = #{orgId}
AND fact.month_id &gt; #{startMonthId}
AND fact.month_id &lt;= #{monthId}
AND fact.index_code = #{indexCode}
ORDER BY
fact.month_id ASC
</select>

14
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml
View File

@ -6,23 +6,24 @@
<select id="selectCommunityAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
SELECT
fact.month_id AS "monthId",
ROUND(fact.score, 1) AS "indexTotal"
ROUND(fact.score, 1) AS "indexTotal",
fact.index_code AS "indexCode"
FROM
fact_index_community_score fact
WHERE
fact.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.agency_id = #{orgId}
AND fact.month_id &gt; #{startMonthId}
AND fact.month_id &lt;= #{monthId}
AND fact.index_code = #{indexCode}
ORDER BY
fact.month_id ASC
</select>
<select id="selectCommunityScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
SELECT
#{indexCode} AS "indexCode",
fact.index_code AS "indexCode",
ROUND(fact.score, 1) AS "indexTotal",
ROUND(self.self_score, 1) AS "agencyScore",
ROUND(self.sub_score, 1) AS "subAgencyScore"
@ -34,10 +35,10 @@
WHERE
fact.del_flag = '0'
AND self.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.agency_id = #{orgId}
AND fact.month_id = #{monthId}
AND fact.index_code = #{indexCode}
</select>
<select id="selectCommunityMonthScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
@ -45,7 +46,8 @@
fact.month_id AS "monthId",
ROUND(fact.score, 1) AS "indexTotal",
ROUND(self.self_score, 1) AS "agencyScore",
ROUND(self.sub_score, 1) AS "subAgencyScore"
ROUND(self.sub_score, 1) AS "subAgencyScore",
fact.index_code AS "indexCode"
FROM
fact_index_community_score fact
INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id
@ -54,11 +56,11 @@
WHERE
fact.del_flag = '0'
AND self.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.agency_id = #{orgId}
AND fact.month_id &gt; #{startMonthId}
AND fact.month_id &lt;= #{monthId}
AND fact.index_code = #{indexCode}
ORDER BY
fact.month_id ASC
</select>

14
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml
View File

@ -6,23 +6,24 @@
<select id="selectGridAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
SELECT
fact.month_id AS "monthId",
ROUND(fact.score, 1) AS "indexTotal"
ROUND(fact.score, 1) AS "indexTotal",
fact.index_code AS "indexCode"
FROM
fact_index_grid_score fact
WHERE
fact.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.grid_id = #{orgId}
AND fact.month_id &gt; #{startMonthId}
AND fact.month_id &lt;= #{monthId}
AND fact.index_code = #{indexCode}
ORDER BY
fact.month_id ASC
</select>
<select id="selectGridScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
SELECT
#{indexCode} AS "indexCode",
fact.index_code AS "indexCode",
ROUND(fact.score, 1) AS "indexTotal",
ROUND(self.self_score, 1) AS "agencyScore",
ROUND(self.sub_score, 1) AS "subAgencyScore"
@ -35,10 +36,10 @@
WHERE
fact.del_flag = '0'
AND self.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.grid_id = #{orgId}
AND fact.month_id = #{monthId}
AND fact.index_code = #{indexCode}
</select>
<select id="selectGridMonthScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
@ -46,7 +47,8 @@
fact.month_id AS "monthId",
ROUND(fact.score, 1) AS "indexTotal",
ROUND(self.self_score, 1) AS "agencyScore",
ROUND(self.sub_score, 1) AS "subAgencyScore"
ROUND(self.sub_score, 1) AS "subAgencyScore",
fact.index_code AS "indexCode"
FROM
fact_index_grid_score fact
INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id
@ -56,11 +58,11 @@
WHERE
fact.del_flag = '0'
AND self.del_flag = '0'
AND fact.is_total = '0' <!-- 表示只查询三大能力的数据 -->
AND fact.customer_id = #{customerId}
AND fact.grid_id = #{orgId}
AND fact.month_id &gt; #{startMonthId}
AND fact.month_id &lt;= #{monthId}
AND fact.index_code = #{indexCode}
ORDER BY
fact.month_id ASC
</select>

Write Preview
Loading…
Cancel
Save