销售报表优化

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

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -41,8 +42,10 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
     String select3(@Param("busOrgSid") String busOrgSid, @Param("brandSid") String brandSid, @Param("vehModelSid") String vehModelSid, @Param("vehMConfigSid") String vehMConfigSid, @Param("createTime") String createTime);
 
     List<BrandVo> selectByBrand(@Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
+    List<BrandVo> selectByBrandNew(@Param("sybOrgSid") String sybOrgSid, @Param("startDate") String startDate,@Param("endDate") String endDate);
 
     List<DailyReportVo> selectReport(@Param("join") List<String> brandList, @Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
+    List<DailyReportVo> selectReportNew(@Param("join") List<String> brandList, @Param("sybOrgSid") String sybOrgSid, @Param("startDate") String startDate,@Param("endDate") String endDate);
 
     IPage<DailyReportListVo> pageList1(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
     IPage<DailyReportListVo> pageList2(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
@@ -50,14 +53,27 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
     ReportVo getReport(@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 
     List<DailyReportVo> selectReport2(String date);
+    List<DailyReportVo> selectReport2New(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
     List<BrandVo> list2(String date);
 
     List<BrandVo> list3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
+    List<BrandVo> list3New(@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("busOrgSid") String busOrgSid);
 
     List<DailyReportVo> selectReport3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
+    List<DailyReportVo> selectReport3New(@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("busOrgSid") String busOrgSid);
 
     List<BrandVo> selectByBrand2(@Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+    List<BrandVo> selectByBrand2New(@Param("useOrgSid") String useOrgSid,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 
     List<DailyReportVo> selectReport4(@Param("join") List<String> brandList, @Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+    List<DailyReportVo> selectReport4New(@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+
+    List<DailyReportListVo> selectRecordList(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
+
+    int selectRecordCount(@Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
+
+    List<DailyReportListVo> selectRecordList2(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
+
+    List<DailyReportListVo> selectRecordList3(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
 }

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

@@ -74,7 +74,7 @@ public class DailyReportRest implements DailyReportFeign {
 
     @Override
     public ResultBean<DailyReportAppVo> list1Old(String date, String busOrgSid) {
-        return dailyReportService.list1(date, busOrgSid);
+        return dailyReportService.list1Old(date, busOrgSid);
     }
 
     @Override
@@ -106,7 +106,7 @@ public class DailyReportRest implements DailyReportFeign {
 
     @Override
     public ResultBean<DailyReportAppVo> list4Old(String date, String useOrgSid) {
-        return dailyReportService.list4(date, useOrgSid);
+        return dailyReportService.list4Old(date, useOrgSid);
     }
 
     @Override