出单量及费用统计 报表调整（添加返回上级）

src/main/java/com/ydtech/modules/report/model/vo/StatisticsReportReqVo.java

@@ -44,5 +44,7 @@ public class StatisticsReportReqVo {
     private String drilType;
     @ApiModelProperty(value = "机构下钻需要截取机构位数  2总部下钻  4一级机构下钻 6二级机构下钻  8三级机构下钻  11四级机构下钻  0五级机构下钻")
     private String drilFlag;
+    @ApiModelProperty(value = "是否返回上层  1 返回上层 0非返回上层")
+    private String isReturnBack;
 
 }

src/main/java/com/ydtech/modules/report/service/impl/ReportServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.ydtech.aop.exception.DescribeException;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysDeptMapper;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.SysDept;
@@ -943,6 +944,15 @@ public class ReportServiceImpl implements ReportService {
         Page<OrderVolumeAndCostStatisticsResVo> orderVolumeAndCostStatisticsResVoPage = reportInsurancePolicyMapper.queryOrderAndCostData(page,
                 reqVo);
         orderVolumeAndCostStatisticsResVoPage.getRecords().stream().forEach(item->{
+            String riskName="";
+            if("ALL".equals(reqVo.getRiskCode())){
+                riskName="全部";
+            }else if("BZ".equals(reqVo.getRiskCode())){
+                riskName="交强";
+            }else if("BUS".equals(reqVo.getRiskCode())){
+                riskName="商业";
+            }
+            item.setRiskName(riskName);
             item.setInstitutionId(reqVo.getDeptId());
             SysDept sysDept1=sysDeptService.getById(reqVo.getDeptId());
             item.setInstitution(sysDept1.getName());
@@ -975,35 +985,103 @@ public class ReportServiceImpl implements ReportService {
     public BasePageResult<OrderVolumeAndCostStatisticsResVo> drilQueryOrderAndCostData(StatisticsReportReqVo reqVo){
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<InsOrders> page = new Page<>(reqVo.getPageNum(), reqVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
-        if(StringUtils.isNotEmpty(reqVo.getTeamCode())){
-            //如果团队不为空，则为团队下钻  查询到业务员
-            reqVo.setDrilType("1");
-        }else{
-            //如果团队为空，则为机构下钻，查询下一级机构
-            reqVo.setDrilType("0");
-            SysDept sysDept=sysDeptService.getById(reqVo.getDeptId());
-            String flag="";
-            if(StringUtils.isNotEmpty(sysDept.getComlevel())){
-                switch (sysDept.getComlevel()){
-                    case "1":
-                        flag="4"; break;
-                    case "2":
-                        flag="6"; break;
-                    case "3":
-                        flag="8"; break;
-                    case "4":
-                        flag="11"; break;
-                    case "5":
-                        flag="0"; break;
+        //返回上层时 调整查询条件
+        if(StringUtils.isNotEmpty(reqVo.getIsReturnBack())&&"1".equals(reqVo.getIsReturnBack())){
+            if(StringUtils.isNotEmpty(reqVo.getTeamCode())){
+                //团队不为空时，直接置为上一级  清空团队
+                reqVo.setTeamCode("");
+                reqVo.setDrilType("3");
+                //如果是机构找上层时
+                SysDept sysDept=sysDeptService.getById(reqVo.getDeptId());
+                reqVo.setDeptId(sysDept.getId());
+                //如果团队为空，则为机构下钻，查询下一级机构
+                String flag="";
+                if(StringUtils.isNotEmpty(sysDept.getComlevel())){
+                    switch (sysDept.getComlevel()){
+                        case "1":
+                            flag="2"; break;
+                        case "2":
+                            flag="4"; break;
+                        case "3":
+                            flag="6"; break;
+                        case "4":
+                            flag="8"; break;
+                        case "5":
+                            flag="11"; break;
+                    }
+                }else{
+                    flag="1";
+                }
+                reqVo.setDrilFlag(flag);
+            }else{
+                reqVo.setDrilType("3");
+                //如果是机构找上层时
+                SysDept sysDept=sysDeptService.getById(reqVo.getDeptId());
+                SysDept sysDept1=sysDeptService.getById(sysDept.getParentId());
+                if(sysDept1==null){
+                    throw new SystemException("已经到最上层，不能继续返回！");
+                }
+                reqVo.setDeptId(sysDept1.getId());
+                //如果团队为空，则为机构下钻，查询下一级机构
+                String flag="";
+                if(StringUtils.isNotEmpty(sysDept1.getComlevel())){
+                    switch (sysDept1.getComlevel()){
+                        case "1":
+                            flag="2"; break;
+                        case "2":
+                            flag="4"; break;
+                        case "3":
+                            flag="6"; break;
+                        case "4":
+                            flag="8"; break;
+                        case "5":
+                            flag="11"; break;
+                    }
+                }else{
+                    flag="1";
                 }
+                reqVo.setDrilFlag(flag);
+            }
+        }else{
+            if(StringUtils.isNotEmpty(reqVo.getTeamCode())){
+                //如果团队不为空，则为团队下钻  查询到业务员
+                reqVo.setDrilType("1");
             }else{
-                flag="2";
+                //如果团队为空，则为机构下钻，查询下一级机构
+                reqVo.setDrilType("0");
+                SysDept sysDept=sysDeptService.getById(reqVo.getDeptId());
+                String flag="";
+                if(StringUtils.isNotEmpty(sysDept.getComlevel())){
+                    switch (sysDept.getComlevel()){
+                        case "1":
+                            flag="4"; break;
+                        case "2":
+                            flag="6"; break;
+                        case "3":
+                            flag="8"; break;
+                        case "4":
+                            flag="11"; break;
+                        case "5":
+                            flag="0"; break;
+                    }
+                }else{
+                    flag="2";
+                }
+                reqVo.setDrilFlag(flag);
             }
-            reqVo.setDrilFlag(flag);
         }
         Page<OrderVolumeAndCostStatisticsResVo> orderVolumeAndCostStatisticsResVoPage = reportInsurancePolicyMapper.queryOrderAndCostData(page,
                 reqVo);
         orderVolumeAndCostStatisticsResVoPage.getRecords().stream().forEach(item->{
+            String riskName="";
+            if("ALL".equals(reqVo.getRiskCode())){
+                riskName="全部";
+            }else if("BZ".equals(reqVo.getRiskCode())){
+                riskName="交强";
+            }else if("BUS".equals(reqVo.getRiskCode())){
+                riskName="商业";
+            }
+            item.setRiskName(riskName);
             //如果返回业务员时
             if(StringUtils.isNotEmpty(item.getUsername())){
                 SysDept sysDept1=sysDeptService.getById(reqVo.getDeptId());
@@ -1063,31 +1141,90 @@ public class ReportServiceImpl implements ReportService {
 
     @Override
     public String exportDrilOrderAndCostData(StatisticsReportReqVo reqDto) {
-        if(StringUtils.isNotEmpty(reqDto.getTeamCode())){
-            //如果团队不为空，则为团队下钻  查询到业务员
-            reqDto.setDrilType("1");
-        }else{
-            //如果团队为空，则为机构下钻，查询下一级机构
-            reqDto.setDrilType("0");
-            SysDept sysDept=sysDeptService.getById(reqDto.getDeptId());
-            String flag="";
-            if(StringUtils.isNotEmpty(sysDept.getComlevel())){
-                switch (sysDept.getComlevel()){
-                    case "1":
-                        flag="4"; break;
-                    case "2":
-                        flag="6"; break;
-                    case "3":
-                        flag="8"; break;
-                    case "4":
-                        flag="11"; break;
-                    case "5":
-                        flag="0"; break;
+        //返回上层时 调整查询条件
+        if(StringUtils.isNotEmpty(reqDto.getIsReturnBack())&&"1".equals(reqDto.getIsReturnBack())){
+            if(StringUtils.isNotEmpty(reqDto.getTeamCode())){
+                //团队不为空时，直接置为上一级  清空团队
+                reqDto.setTeamCode("");
+                reqDto.setDrilType("3");
+                //如果是机构找上层时
+                SysDept sysDept=sysDeptService.getById(reqDto.getDeptId());
+                reqDto.setDeptId(sysDept.getId());
+                //如果团队为空，则为机构下钻，查询下一级机构
+                String flag="";
+                if(StringUtils.isNotEmpty(sysDept.getComlevel())){
+                    switch (sysDept.getComlevel()){
+                        case "1":
+                            flag="2"; break;
+                        case "2":
+                            flag="4"; break;
+                        case "3":
+                            flag="6"; break;
+                        case "4":
+                            flag="8"; break;
+                        case "5":
+                            flag="11"; break;
+                    }
+                }else{
+                    flag="1";
+                }
+                reqDto.setDrilFlag(flag);
+            }else{
+                reqDto.setDrilType("3");
+                //如果是机构找上层时
+                SysDept sysDept=sysDeptService.getById(reqDto.getDeptId());
+                SysDept sysDept1=sysDeptService.getById(sysDept.getParentId());
+                if(sysDept1==null){
+                    throw new SystemException("已经到最上层，不能继续返回！");
+                }
+                reqDto.setDeptId(sysDept1.getId());
+                //如果团队为空，则为机构下钻，查询下一级机构
+                String flag="";
+                if(StringUtils.isNotEmpty(sysDept1.getComlevel())){
+                    switch (sysDept1.getComlevel()){
+                        case "1":
+                            flag="2"; break;
+                        case "2":
+                            flag="4"; break;
+                        case "3":
+                            flag="6"; break;
+                        case "4":
+                            flag="8"; break;
+                        case "5":
+                            flag="11"; break;
+                    }
+                }else{
+                    flag="1";
                 }
+                reqDto.setDrilFlag(flag);
+            }
+        }else{
+            if(StringUtils.isNotEmpty(reqDto.getTeamCode())){
+                //如果团队不为空，则为团队下钻  查询到业务员
+                reqDto.setDrilType("1");
             }else{
-                flag="2";
+                //如果团队为空，则为机构下钻，查询下一级机构
+                reqDto.setDrilType("0");
+                SysDept sysDept=sysDeptService.getById(reqDto.getDeptId());
+                String flag="";
+                if(StringUtils.isNotEmpty(sysDept.getComlevel())){
+                    switch (sysDept.getComlevel()){
+                        case "1":
+                            flag="4"; break;
+                        case "2":
+                            flag="6"; break;
+                        case "3":
+                            flag="8"; break;
+                        case "4":
+                            flag="11"; break;
+                        case "5":
+                            flag="0"; break;
+                    }
+                }else{
+                    flag="2";
+                }
+                reqDto.setDrilFlag(flag);
             }
-            reqDto.setDrilFlag(flag);
         }
         List<OrderVolumeAndCostStatisticsResVo> orderVolumeAndCostStatisticsResVoPage = reportInsurancePolicyMapper.queryOrderAndCostData(reqDto);
         orderVolumeAndCostStatisticsResVoPage.stream().forEach(item->{

src/main/resources/mapper/modules/report/ReportInsurancePolicyMapper.xml

@@ -62,8 +62,20 @@
                     </otherwise>
                 </choose>
             </if>
+            <!--团队返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                p.deptid,
+            </if>
+            <!--机构返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                substr(p.deptid,1,#{reportReqVo.drilFlag}) institutionId,
+            </if>
+        </if>
+        <if test="reportReqVo.riskCode != null and reportReqVo.riskCode != ''">
+            <if test="reportReqVo.riskCode!='ALL'.toString()">
+                p.`risk_name` risk_name,
+            </if>
         </if>
-        p.`risk_name` risk_name,
         count(distinct policyno) policy_count,
         SUM(p.`sumpremium`) sumpremium,
         SUM(p.`supervise_costs_premiums`) supervise_costs_premiums,
@@ -92,6 +104,15 @@
                     </otherwise>
                 </choose>
             </if>
+
+            <!--团队返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                and p.deptid = #{reportReqVo.deptId}
+            </if>
+            <!--机构返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                and substr(p.deptid,1,#{reportReqVo.drilFlag})  = #{reportReqVo.deptId}
+            </if>
         </if>
         <!--非下钻查询时拼接-->
         <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '0'.toString()">
@@ -123,27 +144,71 @@
         <if test="reportReqVo.quoteStartDate != null and reportReqVo.quoteEndDate != null">
             and p.inside_pay_time  between #{reportReqVo.quoteStartDate} AND #{reportReqVo.quoteEndDate}
         </if>
-        GROUP BY p.`risk_name`
-        <!--下钻查询时拼接-->
-        <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '1'.toString()">
-            <!--按团队下钻时-->
-            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '1'.toString()">
-                ,p.`username`,p.userid order by p.`username`,p.`risk_name`
-            </if>
-            <!--按机构下钻时-->
-            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '0'.toString()">
-                <choose>
-                    <!--下钻的是五级机构时，下钻到团队-->
-                    <when test="reportReqVo.drilFlag != null and reportReqVo.drilFlag == '0'.toString()">
-                        ,p.deptid  order by p.deptid,p.`risk_name`
-                    </when>
-                    <!--下钻的非五级机构时，下钻到下级机构-->
-                    <otherwise>
-                        ,substr(p.deptid,1,#{reportReqVo.drilFlag}) order by    substr(p.deptid,1,#{reportReqVo.drilFlag}),p.`risk_name`
-                    </otherwise>
-                </choose>
-            </if>
-        </if>
+
+        <choose>
+            <when test="reportReqVo.riskCode != null and reportReqVo.riskCode!='ALL'.toString()">
+                GROUP BY p.`risk_name`
+                <!--下钻查询时拼接-->
+                <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '1'.toString()">
+                    <!--按团队下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '1'.toString()">
+                        ,p.`username`,p.userid order by p.`username`,p.`risk_name`
+                    </if>
+                    <!--按机构下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '0'.toString()">
+                        <choose>
+                            <!--下钻的是五级机构时，下钻到团队-->
+                            <when test="reportReqVo.drilFlag != null and reportReqVo.drilFlag == '0'.toString()">
+                                ,p.deptid  order by p.deptid,p.`risk_name`
+                            </when>
+                            <!--下钻的非五级机构时，下钻到下级机构-->
+                            <otherwise>
+                                ,substr(p.deptid,1,#{reportReqVo.drilFlag}) order by    substr(p.deptid,1,#{reportReqVo.drilFlag}),p.`risk_name`
+                            </otherwise>
+                        </choose>
+                    </if>
+                    <!--团队返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                        ,p.deptid order by p.deptid
+                    </if>
+                    <!--机构返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                        ,substr(p.deptid,1,#{reportReqVo.drilFlag})   order by substr(p.deptid,1,#{reportReqVo.drilFlag})
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                <!--下钻查询时拼接-->
+                <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '1'.toString()">
+                    <!--按团队下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '1'.toString()">
+                        group by p.`username`,p.userid order by p.`username`
+                    </if>
+                    <!--按机构下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '0'.toString()">
+                        <choose>
+                            <!--下钻的是五级机构时，下钻到团队-->
+                            <when test="reportReqVo.drilFlag != null and reportReqVo.drilFlag == '0'.toString()">
+                                group by  p.deptid  order by p.deptid
+                            </when>
+                            <!--下钻的非五级机构时，下钻到下级机构-->
+                            <otherwise>
+                                group by  substr(p.deptid,1,#{reportReqVo.drilFlag}) order by    substr(p.deptid,1,#{reportReqVo.drilFlag})
+                            </otherwise>
+                        </choose>
+                    </if>
+                    <!--团队返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                        group by p.deptid order by p.deptid
+                    </if>
+                    <!--机构返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                        group by substr(p.deptid,1,#{reportReqVo.drilFlag})   order by substr(p.deptid,1,#{reportReqVo.drilFlag})
+                    </if>
+                </if>
+            </otherwise>
+        </choose>
+
     </select>
 
     <resultMap id="OrderAndCostDataMap" type="com.ydtech.modules.report.model.vo.OrderVolumeAndCostStatisticsResVo">
@@ -161,6 +226,7 @@
         select
         count(1)
         from (
+
         SELECT
         <!--下钻查询时拼接-->
         <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '1'.toString()">
@@ -181,8 +247,20 @@
                     </otherwise>
                 </choose>
             </if>
+            <!--团队返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                p.deptid,
+            </if>
+            <!--机构返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                substr(p.deptid,1,#{reportReqVo.drilFlag}) institutionId,
+            </if>
+        </if>
+        <if test="reportReqVo.riskCode != null and reportReqVo.riskCode != ''">
+            <if test="reportReqVo.riskCode!='ALL'.toString()">
+                p.`risk_name` risk_name,
+            </if>
         </if>
-        p.`risk_name` risk_name,
         count(distinct policyno) policy_count,
         SUM(p.`sumpremium`) sumpremium,
         SUM(p.`supervise_costs_premiums`) supervise_costs_premiums,
@@ -211,6 +289,15 @@
                     </otherwise>
                 </choose>
             </if>
+
+            <!--团队返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                and p.deptid = #{reportReqVo.deptId}
+            </if>
+            <!--机构返回上层时-->
+            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                and substr(p.deptid,1,#{reportReqVo.drilFlag})  = #{reportReqVo.deptId}
+            </if>
         </if>
         <!--非下钻查询时拼接-->
         <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '0'.toString()">
@@ -242,27 +329,71 @@
         <if test="reportReqVo.quoteStartDate != null and reportReqVo.quoteEndDate != null">
             and p.inside_pay_time  between #{reportReqVo.quoteStartDate} AND #{reportReqVo.quoteEndDate}
         </if>
-        GROUP BY p.`risk_name`
-        <!--下钻查询时拼接-->
-        <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '1'.toString()">
-            <!--按团队下钻时-->
-            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '1'.toString()">
-                ,p.`username`,p.userid order by p.`username`,p.`risk_name`
-            </if>
-            <!--按机构下钻时-->
-            <if test="reportReqVo.drilType != null and reportReqVo.drilType == '0'.toString()">
-                <choose>
-                    <!--下钻的是五级机构时，下钻到团队-->
-                    <when test="reportReqVo.drilFlag != null and reportReqVo.drilFlag == '0'.toString()">
-                        ,p.deptid  order by p.deptid,p.`risk_name`
-                    </when>
-                    <!--下钻的非五级机构时，下钻到下级机构-->
-                    <otherwise>
-                        ,substr(p.deptid,1,#{reportReqVo.drilFlag}) order by    substr(p.deptid,1,#{reportReqVo.drilFlag}),p.`risk_name`
-                    </otherwise>
-                </choose>
-            </if>
-        </if>
+
+        <choose>
+            <when test="reportReqVo.riskCode != null and reportReqVo.riskCode!='ALL'.toString()">
+                GROUP BY p.`risk_name`
+                <!--下钻查询时拼接-->
+                <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '1'.toString()">
+                    <!--按团队下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '1'.toString()">
+                        ,p.`username`,p.userid order by p.`username`,p.`risk_name`
+                    </if>
+                    <!--按机构下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '0'.toString()">
+                        <choose>
+                            <!--下钻的是五级机构时，下钻到团队-->
+                            <when test="reportReqVo.drilFlag != null and reportReqVo.drilFlag == '0'.toString()">
+                                ,p.deptid  order by p.deptid,p.`risk_name`
+                            </when>
+                            <!--下钻的非五级机构时，下钻到下级机构-->
+                            <otherwise>
+                                ,substr(p.deptid,1,#{reportReqVo.drilFlag}) order by    substr(p.deptid,1,#{reportReqVo.drilFlag}),p.`risk_name`
+                            </otherwise>
+                        </choose>
+                    </if>
+                    <!--团队返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                        ,p.deptid order by p.deptid
+                    </if>
+                    <!--机构返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                        ,substr(p.deptid,1,#{reportReqVo.drilFlag})   order by substr(p.deptid,1,#{reportReqVo.drilFlag})
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                <!--下钻查询时拼接-->
+                <if test="reportReqVo.isDrilling != null and reportReqVo.isDrilling == '1'.toString()">
+                    <!--按团队下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '1'.toString()">
+                        group by p.`username`,p.userid order by p.`username`
+                    </if>
+                    <!--按机构下钻时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '0'.toString()">
+                        <choose>
+                            <!--下钻的是五级机构时，下钻到团队-->
+                            <when test="reportReqVo.drilFlag != null and reportReqVo.drilFlag == '0'.toString()">
+                                group by  p.deptid  order by p.deptid
+                            </when>
+                            <!--下钻的非五级机构时，下钻到下级机构-->
+                            <otherwise>
+                                group by  substr(p.deptid,1,#{reportReqVo.drilFlag}) order by    substr(p.deptid,1,#{reportReqVo.drilFlag})
+                            </otherwise>
+                        </choose>
+                    </if>
+                    <!--团队返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '2'.toString()">
+                        group by p.deptid order by p.deptid
+                    </if>
+                    <!--机构返回上层时-->
+                    <if test="reportReqVo.drilType != null and reportReqVo.drilType == '3'.toString()">
+                        group by substr(p.deptid,1,#{reportReqVo.drilFlag})   order by substr(p.deptid,1,#{reportReqVo.drilFlag})
+                    </if>
+                </if>
+            </otherwise>
+        </choose>
+
         ) as s
     </select>