统计报表相关优化

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@@ -89,7 +89,7 @@ public interface DailyReportFeign {
     @ApiOperation("集团日期初始化")
     @GetMapping("getReport")
     @ResponseBody
-    ResultBean<ReportVo> getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid);
+    ResultBean<ReportVo> getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath,@RequestParam("type")String type);
 
     @ApiOperation("集团事业部合集日报表")
     @GetMapping("list2")
@@ -111,20 +111,20 @@ public interface DailyReportFeign {
     @ResponseBody
     ResultBean<DailyReportListVo> pageList2(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
 
-    @ApiOperation("事业部日期初始化")
+   /* @ApiOperation("事业部日期初始化")
     @GetMapping("getReport2")
     @ResponseBody
     ResultBean<ReportVo> getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid);
-
+*/
     @ApiOperation("分公司日报表分页列表")
     @PostMapping("pageList3")
     @ResponseBody
     ResultBean<DailyReportListVo> pageList3(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
 
-    @ApiOperation("分公司日期初始化")
+  /*  @ApiOperation("分公司日期初始化")
     @GetMapping("getReport3")
     @ResponseBody
     ResultBean<ReportVo> getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid);
-
+*/
 
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java

@@ -112,10 +112,14 @@ public class ReportVo implements Vo {
     private String loan_not_amount;
     @ApiModelProperty("前三个月销售台数之和")
     private String saleAllToThree;
-
+    @ApiModelProperty("事业部sid")
     private String busOrgSid;
-
+    @ApiModelProperty("事业部名称")
+    private String busOrgName;
+    @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
 
     private List<ReportSetVo> list;
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -297,7 +297,7 @@
         ifnull(sum(loan_not_count), 0)              as loan_not_count,
         ifnull(sum(loan_not_amount), 0)             as loan_not_amount,
         ifnull(sum(saleAllToThree), 0)              as saleAllToThree,
-        busOrgSid,useOrgSid
+        busOrgSid,useOrgSid,busOrgName,useOrgName
         from daily_report
         <where>
             ${ew.sqlSegment}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java

@@ -85,8 +85,8 @@ public class DailyReportRest implements DailyReportFeign {
     }
 
     @Override
-    public ResultBean<ReportVo> getReport(String date,String userSid) {
-        return dailyReportService.getReport(date,userSid);
+    public ResultBean<ReportVo> getReport(String date,String userSid,String orgPath,String type) {
+        return dailyReportService.getReport(date,userSid,orgPath,type);
     }
 
     @Override
@@ -111,10 +111,10 @@ public class DailyReportRest implements DailyReportFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
+   /* @Override
     public ResultBean<ReportVo> getReport2(String date, String orgPath,String userSid) {
         return dailyReportService.getReport2(date,orgPath,userSid);
-    }
+    }*/
 
     @Override
     public ResultBean<DailyReportListVo> pageList3(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
@@ -123,8 +123,8 @@ public class DailyReportRest implements DailyReportFeign {
         return rb.success().setData(pv);
     }
 
-    @Override
+   /* @Override
     public ResultBean<ReportVo> getReport3(String date, String orgPath,String userSid) {
         return dailyReportService.getReport3(date,orgPath,userSid);
-    }
+    }*/
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -631,12 +631,26 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         return p;
     }
 
-    public ResultBean<ReportVo> getReport(String date, String userSid) {
+    public ResultBean<ReportVo> getReport(String date, String userSid,String orgPath,String type) {
         ResultBean<ReportVo> rb = ResultBean.fireFail();
         QueryWrapper<DailyReport> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(date)) {
             qw.like("createTime", date);
         }
+        if(StringUtils.isNotBlank(type)){//事业部或分公司
+            if("syb".equals(type)){
+                if (StringUtils.isNotBlank(orgPath)) {
+                    List<String> stringList = Arrays.asList(orgPath.split("/"));
+                    String busOrgSid = orgPath.substring(37, 73);
+                    qw.eq("busOrgSid", busOrgSid);
+                }
+            }else if("fgs".equals(type)){
+                if (StringUtils.isNotBlank(orgPath)) {
+                    String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                    qw.eq("useOrgSid", useOrgSid);
+                }
+            }
+        }
         ReportVo reportVo = baseMapper.getReport(qw);
         String ratio = "";
         if (StringUtils.isBlank(reportVo.getSaleAllToThree())) {