zxc 3 years ago
parent
commit
5138b5985b
  1. 1
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
  2. 3
      epmet-user/epmet-user-client/src/main/java/com/epmet/enums/NatPieColorEnum.java
  3. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java

1
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@ -85,6 +85,7 @@ public interface NumConstant {
String POSITIVE_EIGHT_STR = "+8"; String POSITIVE_EIGHT_STR = "+8";
String EMPTY_STR = ""; String EMPTY_STR = "";
String ONE_NEG_STR = "-1"; String ONE_NEG_STR = "-1";
String ONE_HUNDRED_STR = "100";
String FIFTY_STR="50"; String FIFTY_STR="50";
} }

3
epmet-user/epmet-user-client/src/main/java/com/epmet/enums/NatPieColorEnum.java

@ -13,7 +13,8 @@ public enum NatPieColorEnum {
REd("0","#ee6666"), REd("0","#ee6666"),
YELLOW("2","#fac858"), YELLOW("2","#fac858"),
ORANGE("1","#fc8452"), ORANGE("1","#fc8452"),
GREEN("3","#91cc75"), THREE("3","#73c0de"),
GREEN("100","#91cc75"),
; ;
private String key; private String key;

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java

@ -601,7 +601,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
NatPieResultDTO.IsolatedList dto = new NatPieResultDTO.IsolatedList(); NatPieResultDTO.IsolatedList dto = new NatPieResultDTO.IsolatedList();
dto.setCategoryCode(""); dto.setCategoryCode("");
dto.setCategoryName("历史关注人数"); dto.setCategoryName("历史关注人数");
dto.setColor(NatPieColorEnum.getValueByKey(NumConstant.THREE_STR)); dto.setColor(NatPieColorEnum.getValueByKey(NumConstant.ONE_HUNDRED_STR));
dto.setTotal(baseDao.getHistoryCount(staffInfo.getAgencyId())); dto.setTotal(baseDao.getHistoryCount(staffInfo.getAgencyId()));
result.setIsolatedList(conResult); result.setIsolatedList(conResult);
result.setHistoryList(Arrays.asList(dto)); result.setHistoryList(Arrays.asList(dto));

Loading…
Cancel
Save