Merge remote-tracking branch 'origin/master'

lidee-core/src/main/java/com/lideeyunji/core/framework/controller/NewGrBiSaAggMonthCountController.java

@@ -45,7 +45,7 @@ public class NewGrBiSaAggMonthCountController extends BaseController
     {
         Map<String, Object> params = FuncWeb.getParameterBodyMap(req);
         SaAggParam saAggParam = new SaAggParam();
-
+        String groupField = params.get("Group by").toString();
         if (params.containsKey("usemonth")){
             saAggParam.setUseMonth(params.get("usemonth").toString());
         }
@@ -71,7 +71,7 @@ public class NewGrBiSaAggMonthCountController extends BaseController
         if (params.containsKey("stdGoodsName")){
             saAggParam.setStdGoodsName(Arrays.asList(params.get("stdGoodsName").toString().split( ",")));
         }
-        if (params.containsKey("usemonth")){
+        if (params.containsKey("usemonth") || groupField.contains("usemonth")){
             List<NewGrBiSaAggMonthCount> list = newGrBiSaAggMonthCountService.getTotalDetail(saAggParam);
             return BaseWebResult.success(list);
         }else{

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java

@@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.enhance.example.report.xtsy;
 
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBeforeAdvicePlugin;
+import com.lideeyunji.tool.framework.exception.lideeYunJiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -22,6 +23,9 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         log.info("进入=======>zhxsqkLineReportEnhance=======>execute");
         Map<String, Object> params = enhanceContext.getParam().getParams();
         if (params.containsKey("Group by")) {
+            if(params.containsKey("goodsname")){
+                throw new lideeYunJiException("在选择维度时，“货品名称”不能有值！");
+            }
             List<String> groupFieldList = Arrays.asList(params.get("Group by").toString().split(","));
             String sql;
             if((groupFieldList.contains("usemonth") || params.containsKey("usemonth"))){

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java

@@ -151,10 +151,10 @@ public class NewGrBiSaAggMonthCount implements Serializable
 
 
     @TableField(value = "thissamoney_s")
-    private BigDecimal thissamoney_s;
+    private BigDecimal thisMonthSaMoney_s;
 
     @TableField(value = "thisprofit_s")
-    private BigDecimal thisprofit_s;
+    private BigDecimal thisMonthProfit_s;
 
 
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java

@@ -146,9 +146,9 @@ public class NewGrBiSaAggYearCount implements Serializable
     private BigDecimal thisYearProfitChange;
 
     @TableField(value = "this_year_sa_money_s")
-    private BigDecimal thisYearSaMoney_s;
+    private BigDecimal thissamoney_s;
 
     @TableField(value = "this_year_profit_s")
-    private BigDecimal thisYearProfit_s;
+    private BigDecimal thisprofit_s;
 
 }

lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml

@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lastMonthProfitShare"    column="last_month_profit_share"    />
         <result property="thisMonthSaMoneyShare"    column="this_month_sa_money_share"    />
         <result property="thisMonthProfitShare"    column="this_month_profit_share"    />
-        <result property="thissamoney_s"    column="thissamoney_s"    />
+        <result property="thisMonthSaMoney_s"    column="thissamoney_s"    />
-        <result property="thisprofit_s"    column="thisprofit_s"    />
+        <result property="thisMonthProfit_s"    column="thisprofit_s"    />
     </resultMap>
 
     <sql id="selectNewGrBiSaAggMonthCountVo">
@@ -48,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getTotalDetail" parameterType="com.lideeyunji.core.framework.params.SaAggParam" resultMap="NewGrBiSaAggMonthCountResult">
         SELECT
-        SUM( this_month_sa_money ) AS thissamoney_s,
+        ROUND(SUM(this_month_sa_money) / 10000, 2) AS thissamoney_s,
-        SUM( this_month_profit ) AS thisprofit_s
+        ROUND(SUM(this_month_profit) / 10000, 2) AS thisprofit_s
         FROM  new_gr_bi_sa_agg_month_count
         <where>
             <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>

lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml

@@ -37,8 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisYearSaMoneyGrowth"    column="this_year_sa_money_growth"    />
         <result property="thisYearProfitGrowth"    column="this_year_profit_growth"    />
         <result property="thisYearProfitChange"    column="this_year_profit_change"    />
-        <result property="thisYearSaMoney_s"    column="this_year_sa_money_s"    />
+        <result property="thissamoney_s"    column="this_year_sa_money_s"    />
-        <result property="thisYearProfit_s"    column="this_year_profit_s"    />
+        <result property="thisprofit_s"    column="this_year_profit_s"    />
     </resultMap>
 
     <sql id="selectNewGrBiSaAggYearCountVo">
@@ -47,8 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getTotalDetail" parameterType="com.lideeyunji.core.framework.params.SaAggParam" resultMap="NewGrBiSaAggYearCountResult">
         SELECT
-        SUM( this_year_sa_money ) AS this_year_sa_money_s,
+        ROUND(SUM(this_year_sa_money) / 10000, 2) AS this_year_sa_money_s,
-        SUM( this_year_profit ) AS this_year_profit_s
+        ROUND(SUM(this_year_profit) / 10000, 2) AS this_year_profit_s
         FROM  new_gr_bi_sa_agg_year_count
         <where>
             <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>