下钻查询结果调整

lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/SaSetdtlSyncJob.java

@@ -2,7 +2,6 @@ package com.lideeyunji.core.framework.config.job;
 
 
 import com.lideeyunji.core.framework.service.IGrBiSaSetdtlService;
-import com.lideeyunji.core.framework.service.ILideeYunJiService;
 import com.lideeyunji.tool.framework.quartz.core.handler.JobHandler;
 import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore;
 import lombok.extern.slf4j.Slf4j;

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

@@ -124,7 +124,7 @@ public class NewGrBiSaAggMonthCountController extends BaseController
         Map<String, Object> params = FuncWeb.getParameterBodyMap(req);
         Page<Object> page = PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()));
         ZhxsqkPlugin.setMonthOrderBy(params, page);
-        List<NewGrBiSaAgg> newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggList(params);
+        List<NewGrBiSaAgg> newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggRecordList(params);
         PageInfo<NewGrBiSaAgg> pageInfo =  new PageInfo<>(newGrBiSaAggList);
         List<Map<String, Object>> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList());
         return ResultDataModel.fomat(pageInfo.getTotal(),list);

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

@@ -18,7 +18,6 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMapper.java

@@ -74,6 +74,16 @@ public interface NewGrBiSaAggMapper extends BaseMapper<NewGrBiSaAgg>
     @DS(value = "#dataSourceType")
     public List<NewGrBiSaAgg> selectNewGrBiSaAggList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam")SaAggParam saAggParam, @Param("params") Map<String, Object> params);
 
+    /**
+     * 查询综合销售情况明细列表
+     *
+     * @param saAggParam 综合销售情况明细参数
+     * @return 综合销售情况明细集合
+     */
+    @DataPermission(enable = false)
+    @DS(value = "#dataSourceType")
+    public List<NewGrBiSaAgg> selectNewGrBiSaAggRecordList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam")SaAggParam saAggParam, @Param("params") Map<String, Object> params);
+
     /**
      * 新增综合销售情况明细
      * 

lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggService.java

@@ -30,7 +30,13 @@ public interface INewGrBiSaAggService
      * @param params 综合销售情况明细
      * @return 综合销售情况明细集合
      */
-    public List<NewGrBiSaAgg> selectNewGrBiSaAggList(Map<String, Object> params);
+    public List<NewGrBiSaAgg> selectNewGrBiSaAggList(Map<String, Object> params);    /**
+     * 查询综合销售情况明细列表
+     *
+     * @param params 综合销售情况明细
+     * @return 综合销售情况明细集合
+     */
+    public List<NewGrBiSaAgg> selectNewGrBiSaAggRecordList(Map<String, Object> params);
 
     /**
      * 新增综合销售情况明细

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java

@@ -158,6 +158,18 @@ public class NewGrBiSaAggServiceImpl extends ServiceImpl<NewGrBiSaAggMapper, New
         SaAggParam saAggParam = createParam(params);
         return this.baseMapper.selectNewGrBiSaAggList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam, params);
     }
+    /**
+     * 查询综合销售情况明细列表
+     *
+     * @param params 综合销售情况明细
+     * @return 综合销售情况明细
+     */
+    @Override
+    public List<NewGrBiSaAgg> selectNewGrBiSaAggRecordList(Map<String, Object> params)
+    {
+        SaAggParam saAggParam = createParam(params);
+        return this.baseMapper.selectNewGrBiSaAggRecordList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam, params);
+    }
 
 
     public static SaAggParam createParam(Map<String, Object> params) {

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

@@ -769,6 +769,91 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectNewGrBiSaAggRecordList"  resultMap="NewGrBiSaAggCountResult">
+        SELECT
+            ANY_VALUE (tbl_lgbsa.id) id,
+            tbl_lgbsa.use_year,
+            tbl_lgbsa.use_month,
+            tbl_lgbsa.zone_id,
+            tbl_lgbsa.zone_name,
+            tbl_lgbsa.sale_type_id,
+            tbl_lgbsa.sale_type_name,
+            tbl_lgbsa.custom_id,
+            tbl_lgbsa.custom_name,
+            tbl_lgbsa.dosage_id,
+            tbl_lgbsa.dosage_name,
+            tbl_lgbsa.effect_id,
+            tbl_lgbsa.effect_name,
+            tbl_lgbsa.goods_id,
+            tbl_lgbsa.goods_name,
+            tbl_lgbsa.std_goods_name,
+            tbl_lgbsa.province_id,
+            tbl_lgbsa.province_name,
+            tbl_lgbsa.saler_id,
+            tbl_lgbsa.saler_name,
+            tbl_lgbsa.this_month_sa_qty AS this_month_sa_qty,
+            ROUND(tbl_lgbsa.this_month_sa_money / 10000, 2) AS this_month_sa_money,
+            ROUND(tbl_lgbsa.this_month_cost / 10000, 2) AS this_month_cost,
+            ROUND(tbl_lgbsa.this_month_profit / 10000, 2) AS this_month_profit
+        FROM
+        new_gr_bi_sa_agg tbl_lgbsa
+        <where>
+            <if test="saAggParam.useYearStart != null and saAggParam.useYearStart != '' and saAggParam.useMonthStart != null and saAggParam.useMonthStart != ''">
+                AND (use_year * 100 + use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart})
+            </if>
+            <if test="saAggParam.useYearEnd != null and saAggParam.useYearEnd != '' and saAggParam.useMonthEnd != null and saAggParam.useMonthEnd != ''">
+                AND (use_year * 100 + use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd})
+            </if>
+            <if test="saAggParam.useYear != null and saAggParam.useYear != '' and saAggParam.useMonth != null and saAggParam.useMonth != ''">
+                AND (use_year * 100 + use_month) = (#{saAggParam.useYear} * 100 + #{saAggParam.useMonth})
+            </if>
+            <if test="saAggParam.useYear != null and saAggParam.useYear != '' and (saAggParam.useMonth == null or saAggParam.useMonth == '' )">
+                AND use_year = #{saAggParam.useYear}
+            </if>
+            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
+                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and sale_type_name in
+                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and custom_name in
+                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and dosage_name in
+                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and goods_name in
+                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and province_name in
+                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and saler_name in
+                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+
+            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and std_goods_name in
+                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <select id="selectNewGrBiSaAggById" parameterType="Long" resultMap="NewGrBiSaAggResult">
         <include refid="selectNewGrBiSaAggVo"/>
         where id = #{id}