Commit 5785e763446336a284349eb4f606c76df15e4a43

Authored by zhangmeiyang
1 parent 41f3fec5

品类交易报表修复

ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/CategoriesBusinessVO.java
1 package com.diligrp.etrade.report.domain.vo; 1 package com.diligrp.etrade.report.domain.vo;
2 2
3 -import com.diligrp.etrade.core.jackson.serializer.*; 3 +import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
4 import com.fasterxml.jackson.databind.annotation.JsonSerialize; 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
5 6
6 import java.io.Serializable; 7 import java.io.Serializable;
@@ -56,7 +57,6 @@ public class CategoriesBusinessVO implements Serializable { @@ -56,7 +57,6 @@ public class CategoriesBusinessVO implements Serializable {
56 /** 57 /**
57 *平均价 58 *平均价
58 */ 59 */
59 - @JsonSerialize(using = PieceSerializer.class)  
60 private String avgAmount; 60 private String avgAmount;
61 61
62 public Long getCategoryId() { 62 public Long getCategoryId() {
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatMapper.xml
@@ -600,7 +600,7 @@ @@ -600,7 +600,7 @@
600 , MAX(t.maxAmount) AS maxAmount 600 , MAX(t.maxAmount) AS maxAmount
601 , t.districtId AS districtId 601 , t.districtId AS districtId
602 , t.districtName AS districtName 602 , t.districtName AS districtName
603 - , ABS(ROUND(SUM(t.businessAmount) / SUM(t.businessWeight) * 5, 2 )) AS avgAmount 603 + , ABS(ROUND(SUM(t.businessAmount) / SUM(t.businessWeight) * 100, 2 )) AS avgAmount
604 <if test="categoryLevel.code == 4"> 604 <if test="categoryLevel.code == 4">
605 ,t.categoryId AS categoryId 605 ,t.categoryId AS categoryId
606 </if> 606 </if>