shiyang / regional-platform

Download as
Browse Code »

Commit b15641710c1e7f934459e867ca828feacdc94d4c

Authored by liquanyu
2 parents cb3bcc8945 7ff90d64af
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java View file @ b156417
... ... @@ -55,10 +55,10 @@
55 55 public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) {
56 56 Map<String,Object> result= new HashMap<String, Object>();
57 57 Map<String, String> colormap = new HashMap<>();
58   - colormap.put("紫色", "#FCC0F6");
59   - colormap.put("红色", "#FFBDBE");
60   - colormap.put("橙色", "#FFD6BD");
61   - colormap.put("黄色", "#FFFEBD");
  58 + colormap.put("紫色", "#ff00ff");
  59 + colormap.put("红色", "#ff0000");
  60 + colormap.put("橙色", "#ff8800");
  61 + colormap.put("黄色", "#ffff00");
62 62 colormap.put("其他", "#DEDCE0");
63 63  
64 64 Normal normal = new Normal(true, null);
... ... @@ -154,6 +154,7 @@
154 154 Series groupRiskSeries = new Series();
155 155 groupRiskSeries.setName("高危人数");
156 156 groupRiskSeries.setType("bar");
  157 + groupRiskSeries.setLabel(label);
157 158 mapsData.clear();
158 159 for (AreaData areaData:currentRiskList) {
159 160 String groupName = areaData.getGroupName().replace("预警", "");
... ... @@ -357,6 +358,7 @@
357 358 option.setxAxis(xAxis);
358 359 AxisPointer yAxis = new AxisPointer();
359 360 yAxis.setType("category");
  361 + yAxis.setAxisLabel(new AxisPointer());
360 362 List<Object> dataList = new ArrayList<Object>();
361 363 yAxis.setData(dataList);
362 364 option.setyAxis(yAxis);
platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/AxisPointer.java View file @ b156417
... ... @@ -11,6 +11,15 @@
11 11 private List<Object> boundaryGap;
12 12 private List<Object> data;
13 13 private Integer interval = 0;
  14 + private AxisPointer axisLabel;
  15 +
  16 + public AxisPointer getAxisLabel() {
  17 + return axisLabel;
  18 + }
  19 +
  20 + public void setAxisLabel(AxisPointer axisLabel) {
  21 + this.axisLabel = axisLabel;
  22 + }
14 23  
15 24 public Integer getInterval() {
16 25 return interval;
platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml View file @ b156417
... ... @@ -549,7 +549,7 @@
549 549 AND F.HIGH_RISK_GROUP<>'其他'
550 550 AND B.EXAMINE_HISTORY_NUM=1
551 551 AND B.INSERT_DATE<=TRUNC(SYSDATE)
552   - AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-6))
  552 + AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-12))
553 553 ]]>
554 554 <if test="provinceId != null and provinceId != ''">
555 555 AND D.PROVINCE_ID=#{provinceId}