From 86c486af90c6f6f4b00e0979f48992b38eb0ff6a Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 30 Dec 2020 18:06:29 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 26 ++++++++++++++++++++++++-- zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java | 10 ++++++++++ zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml | 14 ++++++++++---- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java index 83a3a5a..4b50b34 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java @@ -9,6 +9,7 @@ import com.matrix.system.hive.dao.SysBusinessDataDao; import com.matrix.system.hive.service.imp.DataAnalysisCustomerServiceImpl; import com.matrix.system.hiveErp.analysUtil.Caculate; +import com.matrix.system.hiveErp.analysUtil.SeriesVo; import com.matrix.system.hiveErp.analysUtil.StatisticsParamVo; import com.matrix.system.hiveErp.analysUtil.StatisticsTimeDaoParam; import com.matrix.system.hiveErp.dao.TjVipSumDao; @@ -21,6 +22,8 @@ import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -71,7 +74,7 @@ @PostMapping(value = "/findBusinessInCome") public AjaxResult findBusinessInCome(@RequestBody @Validated StatisticsParamVo statisticsParam) { if (statisticsParam.getShopId() != null) { - return dataAnalysisCustomerService.getAnalysisResult(statisticsParam, new Caculate<BigDecimal>() { + AjaxResult ajaxResult = dataAnalysisCustomerService.getAnalysisResult(statisticsParam, new Caculate<BigDecimal>() { @Override public Map<String, BigDecimal> exec(List<StatisticsTimeDaoParam> timeSpaceParam, Long shopId, Long companyId) { switch (statisticsParam.getType()) { @@ -96,8 +99,9 @@ } } }); + return setDataList(ajaxResult); } else { - return dataAnalysisCustomerService.getCompanyAnalysisResult(statisticsParam, new Caculate<BigDecimal>() { + AjaxResult ajaxResult = dataAnalysisCustomerService.getCompanyAnalysisResult(statisticsParam, new Caculate<BigDecimal>() { @Override public Map<String, BigDecimal> exec(List<StatisticsTimeDaoParam> timeSpaceParam, Long shopId, Long companyId) { switch (statisticsParam.getType()) { @@ -122,7 +126,25 @@ } } }); + return setDataList(ajaxResult); } } + private AjaxResult setDataList(AjaxResult ajaxResult) { + List<SeriesVo> list = (List<SeriesVo>) ajaxResult.getMapInfo().get("series"); + String[] xAxis = (String[]) ajaxResult.getMapInfo().get("xAxis"); + String [] data = list.get(0).getData(); + if (data != null && data.length != 0) { + List<Map<String, String>> dataList = new ArrayList<>(); + for(int i = data.length - 1; i >= 0; i--) { + Map<String, String> map = new HashMap<>(); + map.put(xAxis[i], data[i]); + dataList.add(map); + } + ajaxResult.setRows(dataList); + } + + return ajaxResult; + } + } diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java index 884b2c7..3c9420e 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java @@ -56,6 +56,8 @@ private String type; private Long shopId; + + private String parentIds; /** * 扩展属性 @@ -159,6 +161,14 @@ this.type=type; } + public String getParentIds() { + return parentIds; + } + + public void setParentIds(String parentIds) { + this.parentIds = parentIds; + } + @Override public String toString() { return "ArticleType [id=" + id + ", articleTypeName=" + articleTypeName diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml index c45c853..65db100 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml @@ -12,7 +12,8 @@ <result property="description" column="description" /> <result property="url" column="url" /> <result property="icon" column="icon" /> - <result property="type" column="type" /> + <result property="type" column="type" /> + <result property="parentIds" column="parent_ids" /> <result property="shopId" column="shop_id"/> <!--扩展属性 --> <!-- <association property="article" javaType="Article" @@ -30,7 +31,8 @@ url, icon, type, - shop_id + shop_id, + parent_ids ) VALUES ( #{id}, @@ -41,7 +43,8 @@ #{url}, #{icon}, #{type}, - #{shopId} + #{shopId}, + #{parentIds} ) </insert> @@ -70,7 +73,10 @@ </if> <if test="type != null and type !='' "> type = #{type}, - </if> + </if> + <if test="parentIds != null and parentIds !='' "> + parent_ids = #{parentIds}, + </if> </set> WHERE id=#{id} </update> -- Gitblit v1.9.1