diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppPagerQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppPagerQuery.java index 2bae50ae1c..9f2113797c 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppPagerQuery.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppPagerQuery.java @@ -11,4 +11,6 @@ import lombok.Data; @Data public class DailyReportAppPagerQuery implements Query { private static final long serialVersionUID = 1122320253221250027L; + + private String orgPath; } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java index e642390584..528245a8b8 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java @@ -74,6 +74,8 @@ public interface DailyReportFeign { @ResponseBody ResultBean> listPage_1(@RequestBody PagerQuery pagerQuery); + //--------------------------移动端-------------------------------------> + @ApiOperation("事业部明细日报表") @GetMapping("list1") @ResponseBody @@ -82,7 +84,7 @@ public interface DailyReportFeign { @ApiOperation("移动端集团列表") @PostMapping("pageList1") @ResponseBody - ResultBean> pageList1(@RequestBody PagerQuery pagerQuery); + ResultBean> pageList1(@RequestBody PagerQuery pagerQuery); @ApiOperation("集团日期初始化") @GetMapping("getReport") @@ -104,4 +106,23 @@ public interface DailyReportFeign { @ResponseBody ResultBean list4(@RequestParam("date") String date, @RequestParam("useOrgSid") String useOrgSid); + @ApiOperation("事业部分页列表") + @PostMapping("pageList2") + @ResponseBody + ResultBean pageList2(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("事业部日期初始化") + @GetMapping("getReport2") + @ResponseBody + ResultBean getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath); + + @ApiOperation("分公司日报表分页列表") + @PostMapping("pageList3") + @ResponseBody + ResultBean pageList3(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("分公司日期初始化") + @GetMapping("getReport3") + @ResponseBody + ResultBean getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java index bf1cb15b63..324e84a97a 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java @@ -37,4 +37,6 @@ public class DailyReportListVo { private String saleAllToThree; private String stock_total; + + private String busOrgSid; } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java index b8a212dce4..404d841d26 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java @@ -109,4 +109,8 @@ public class ReportVo implements Vo { private String loan_not_amount; @ApiModelProperty("前三个月销售台数之和") private String saleAllToThree; + + private String busOrgSid; + + private String useOrgSid; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java index 20e720080e..e0aaef1b58 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java @@ -45,6 +45,7 @@ public interface DailyReportMapper extends BaseMapper { List selectReport(@Param("join") List brandList, @Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime); IPage pageList1(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage pageList2(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); ReportVo getReport(@Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml index 8513c87c7b..32c92dcab5 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -212,7 +212,7 @@ sum(loan_not_amount) as loan_not_amount, sum(buyout_day) as buyout_day, sum(saleAllToThree) as saleAllToThree, - SUM(stock_total) as stock_total, + SUM(stock_total) as stock_total, useOrgSid from daily_report @@ -222,6 +222,28 @@ order by DATE_FORMAT(createTime, '%Y-%m-%d') desc + +