yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

销售报表优化

zhanglei
dimengzhe 3 months ago
parent
8eefbe3608
commit
74b7695ef6
4 changed files with 3386 additions and 955 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
  2. 438
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
  3. 4
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java
  4. 3159
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

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

@ -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);
}

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

@ -301,6 +301,36 @@
GROUP BY dr.brandSid
order by dr.brandSid desc
</select>
<select id="selectByBrandNew" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
SELECT dr.brandSid linkSid,
dr.brandName NAME,
b.colspan
FROM daily_report dr
left join
(
select count(a.brandSid) as colspan,
a.brandSid
from (SELECT ddr.brandSid
FROM daily_report ddr
left join
anrui_base.base_model_config bmv
on ddr.vehMConfigSid = bmv.sid
left join
anrui_base.base_vehicle_model bm
on bm.sid = ddr.vehModelSid
WHERE ddr.createTime between #{startDate} and #{endDate}
and ddr.busOrgSid = #{sybOrgSid}
group by ddr.brandSid,
bm.fuelTypeValue,
bm.emissionStandardValue) a
group by a.brandSid) b
on b.brandSid = dr.brandSid
WHERE dr.busOrgSid = #{sybOrgSid}
AND dr.createTime between #{startDate} and #{endDate}
GROUP BY dr.brandSid
order by dr.brandSid desc
</select>
<select id="selectReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select <!--ifnull(sum(SUBSTRING_INDEX(dr.saleOfStockRatio, ':', 1) / SUBSTRING_INDEX(dr.saleOfStockRatio, ':', -1)),
0) as saleOfStockRatio,-->
@ -372,10 +402,78 @@
order by dr.brandSid desc
</select>
<select id="selectReportNew" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select
ifnull(sum(dr.saleOfStockRatio), 0) as saleOfStockRatio,
ifnull(sum(dr.stock_total), 0) as stock_total,
ifnull(sum(dr.stock_unreserve), 0) as stock_unreserve,
ifnull(sum(dr.stock_reserve), 0) as stock_reserve,
ifnull(sum(dr.stock_subtotal), 0) as stock_subtotal,
ifnull(sum(dr.stock_buyout_unreserve), 0) as stock_buyout_unreserve,
ifnull(sum(dr.stock_buyout_reserve), 0) as stock_buyout_reserve,
ifnull(sum(dr.stock_buyout_subtotal), 0) as stock_buyout_subtotal,
ifnull(sum(dr.pcOrder_unreserve), 0) as pcOrder_unreserve,
ifnull(sum(dr.pcOrder_reserve), 0) as pcOrder_reserve,
ifnull(sum(dr.pcOrder_subtotal), 0) as pcOrder_subtotal,
ifnull(sum(dr.simpleOrder_day), 0) as simpleOrder_day,
ifnull(sum(dr.simpleOrder_month), 0) as simpleOrder_month,
ifnull(sum(dr.saleOrder_full_day), 0) as saleOrder_full_day,
ifnull(sum(dr.saleOrder_loan_day), 0) as saleOrder_loan_day,
ifnull(sum(dr.saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
ifnull(sum(dr.saleOrder_full_month), 0) as saleOrder_full_month,
ifnull(sum(dr.saleOrder_loan_month), 0) as saleOrder_loan_month,
ifnull(sum(dr.saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
ifnull(sum(dr.saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
ifnull(sum(dr.sale_full_day), 0) as sale_full_day,
ifnull(sum(dr.sale_loan_day), 0) as sale_loan_day,
ifnull(sum(dr.sale_subtotal_day), 0) as sale_subtotal_day,
ifnull(sum(dr.sale_full_month), 0) as sale_full_month,
ifnull(sum(dr.sale_loan_month), 0) as sale_loan_month,
ifnull(sum(dr.sale_subtotal_month), 0) as sale_subtotal_month,
ifnull(sum(dr.sale_full_year), 0) as sale_full_year,
ifnull(sum(dr.sale_loan_year), 0) as sale_loan_year,
ifnull(sum(dr.sale_subtotal_year), 0) as sale_subtotal_year,
ifnull(sum(dr.manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
ifnull(sum(dr.buyout_day), 0) as buyout_day,
ifnull(sum(dr.buyout_month), 0) as buyout_month,
ifnull(sum(dr.buyout_year), 0) as buyout_year,
ifnull(sum(dr.arrears_carry_veh_count), 0) as arrears_carry_veh_count,
ifnull(sum(dr.arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
ifnull(sum(dr.loan_not_count), 0) as loan_not_count,
ifnull(sum(dr.loan_not_amount), 0) as loan_not_amount,
dr.remarks,
ifnull(sum(dr.deliver_loan_day), 0) as deliver_loan_day,
ifnull(sum(dr.deliver_full_day), 0) as deliver_full_day,
ifnull(sum(dr.deliver_subtotal_day), 0) as deliver_subtotal_day,
ifnull(sum(dr.deliver_loan_month), 0) as deliver_loan_month,
ifnull(sum(dr.deliver_full_month), 0) as deliver_full_month,
ifnull(sum(dr.deliver_subtotal_month), 0) as deliver_subtotal_month,
ifnull(sum(dr.deliver_loan_year), 0) as deliver_loan_year,
ifnull(sum(dr.deliver_full_year), 0) as deliver_full_year,
ifnull(sum(dr.deliver_subtotal_year), 0) as deliver_subtotal_year,
ifnull(sum(dr.saleAllToThree), 0) as saleAllToThree
,
bm.fuelTypeValue,
bm.emissionStandardValue,
ifnull(sum(dr.loan_not_counts), 0) as loan_not_counts,
ifnull(sum(dr.loan_not_amounts), 0) as loan_not_amounts,
dr.brandSid
from daily_report dr
left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
where dr.busOrgSid = #{sybOrgSid}
AND dr.createTime between #{startDate} and #{endDate}
and dr.brandSid in
<foreach collection="join" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
group by dr.brandSid, bm.fuelTypeValue, bm.emissionStandardValue
order by dr.brandSid desc
</select>
<select id="pageList1" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
<!--sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) /
SUBSTRING_INDEX(saleOfStockRatio, ':', -1)) as saleOfStockRatio,-->
select DATE(createTime) as date,
sum(saleOfStockRatio) as saleOfStockRatio,
sum(stock_subtotal) as stock_subtotal,
sum(pcOrder_subtotal) as pcOrder_subtotal,
@ -392,8 +490,8 @@
<where>
${ew.sqlSegment}
</where>
group by DATE_FORMAT(createTime, '%Y-%m-%d')
order by DATE_FORMAT(createTime, '%Y-%m-%d') desc
group by DATE(createTime)
order by DATE(createTime) desc
</select>
<select id="pageList2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
@ -421,8 +519,6 @@
<select id="getReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.ReportVo">
select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
<!--ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) / SUBSTRING_INDEX(saleOfStockRatio, ':', -1)),
0) as saleOfStockRatio,-->
ifnull(sum(saleOfStockRatio), 0) as saleOfStockRatio,
ifnull(sum(stock_total), 0) as stock_total,
ifnull(sum(stock_subtotal), 0) as stock_subtotal,
@ -544,6 +640,65 @@
order by busOrgSid desc
</select>
<select id="selectReport2New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select
ifnull(sum(saleOfStockRatio), 0) as saleOfStockRatio,
ifnull(sum(stock_subtotal), 0) as stock_subtotal,
ifnull(sum(stock_total), 0) as stock_total,
ifnull(sum(stock_unreserve), 0) as stock_unreserve,
ifnull(sum(stock_reserve), 0) as stock_reserve,
ifnull(sum(stock_buyout_unreserve), 0) as stock_buyout_unreserve,
ifnull(sum(stock_buyout_reserve), 0) as stock_buyout_reserve,
ifnull(sum(stock_buyout_subtotal), 0) as stock_buyout_subtotal,
ifnull(sum(pcOrder_unreserve), 0) as pcOrder_unreserve,
ifnull(sum(pcOrder_reserve), 0) as pcOrder_reserve,
ifnull(sum(pcOrder_subtotal), 0) as pcOrder_subtotal,
ifnull(sum(simpleOrder_day), 0) as simpleOrder_day,
ifnull(sum(simpleOrder_month), 0) as simpleOrder_month,
ifnull(sum(saleOrder_full_day), 0) as saleOrder_full_day,
ifnull(sum(saleOrder_loan_day), 0) as saleOrder_loan_day,
ifnull(sum(saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
ifnull(sum(saleOrder_full_month), 0) as saleOrder_full_month,
ifnull(sum(saleOrder_loan_month), 0) as saleOrder_loan_month,
ifnull(sum(saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
ifnull(sum(saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
ifnull(sum(sale_full_day), 0) as sale_full_day,
ifnull(sum(sale_loan_day), 0) as sale_loan_day,
ifnull(sum(sale_subtotal_day), 0) as sale_subtotal_day,
ifnull(sum(sale_full_month), 0) as sale_full_month,
ifnull(sum(sale_loan_month), 0) as sale_loan_month,
ifnull(sum(sale_subtotal_month), 0) as sale_subtotal_month,
ifnull(sum(sale_full_year), 0) as sale_full_year,
ifnull(sum(sale_loan_year), 0) as sale_loan_year,
ifnull(sum(sale_subtotal_year), 0) as sale_subtotal_year,
ifnull(sum(deliver_loan_day), 0) as deliver_loan_day,
ifnull(sum(deliver_full_day), 0) as deliver_full_day,
ifnull(sum(deliver_subtotal_day), 0) as deliver_subtotal_day,
ifnull(sum(deliver_loan_month), 0) as deliver_loan_month,
ifnull(sum(deliver_full_month), 0) as deliver_full_month,
ifnull(sum(deliver_subtotal_month), 0) as deliver_subtotal_month,
ifnull(sum(deliver_loan_year), 0) as deliver_loan_year,
ifnull(sum(deliver_full_year), 0) as deliver_full_year,
ifnull(sum(deliver_subtotal_year), 0) as deliver_subtotal_year,
ifnull(sum(manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
ifnull(sum(buyout_day), 0) as buyout_day,
ifnull(sum(buyout_month), 0) as buyout_month,
ifnull(sum(buyout_year), 0) as buyout_year,
ifnull(sum(arrears_carry_veh_count), 0) as arrears_carry_veh_count,
ifnull(sum(arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
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,
ifnull(sum(loan_not_counts), 0) as loan_not_counts,
ifnull(sum(loan_not_amounts), 0) as loan_not_amounts
from daily_report
where createTime between #{startDate} and #{endDate}
group by busOrgSid
order by busOrgSid desc
</select>
<select id="list2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
select dr.busOrgSid linkSid, dr.busOrgName name, '1' as colspan
from daily_report dr
@ -561,6 +716,15 @@
order by dr.useOrgSid desc
</select>
<select id="list3New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
select dr.useOrgSid linkSid, dr.useOrgName name, '1' as colspan
from daily_report dr
where createTime between #{startDate} and #{endDate}
and busOrgSid = #{busOrgSid}
group by dr.useOrgSid
order by dr.useOrgSid desc
</select>
<select id="selectReport3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select <!--ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) / SUBSTRING_INDEX(saleOfStockRatio, ':', -1)),
0) as saleOfStockRatio,-->
@ -622,6 +786,67 @@
order by useOrgSid desc
</select>
<select id="selectReport3New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select
ifnull(sum(saleOfStockRatio), 0) as saleOfStockRatio,
ifnull(sum(stock_subtotal), 0) as stock_subtotal,
ifnull(sum(stock_unreserve), 0) as stock_unreserve,
ifnull(sum(stock_total), 0) as stock_total,
ifnull(sum(stock_reserve), 0) as stock_reserve,
ifnull(sum(stock_buyout_unreserve), 0) as stock_buyout_unreserve,
ifnull(sum(stock_buyout_reserve), 0) as stock_buyout_reserve,
ifnull(sum(stock_buyout_subtotal), 0) as stock_buyout_subtotal,
ifnull(sum(pcOrder_unreserve), 0) as pcOrder_unreserve,
ifnull(sum(pcOrder_reserve), 0) as pcOrder_reserve,
ifnull(sum(pcOrder_subtotal), 0) as pcOrder_subtotal,
ifnull(sum(simpleOrder_day), 0) as simpleOrder_day,
ifnull(sum(simpleOrder_month), 0) as simpleOrder_month,
ifnull(sum(saleOrder_full_day), 0) as saleOrder_full_day,
ifnull(sum(saleOrder_loan_day), 0) as saleOrder_loan_day,
ifnull(sum(saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
ifnull(sum(saleOrder_full_month), 0) as saleOrder_full_month,
ifnull(sum(saleOrder_loan_month), 0) as saleOrder_loan_month,
ifnull(sum(saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
ifnull(sum(saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
ifnull(sum(sale_full_day), 0) as sale_full_day,
ifnull(sum(sale_loan_day), 0) as sale_loan_day,
ifnull(sum(sale_subtotal_day), 0) as sale_subtotal_day,
ifnull(sum(sale_full_month), 0) as sale_full_month,
ifnull(sum(sale_loan_month), 0) as sale_loan_month,
ifnull(sum(sale_subtotal_month), 0) as sale_subtotal_month,
ifnull(sum(sale_full_year), 0) as sale_full_year,
ifnull(sum(sale_loan_year), 0) as sale_loan_year,
ifnull(sum(sale_subtotal_year), 0) as sale_subtotal_year,
ifnull(sum(deliver_loan_day), 0) as deliver_loan_day,
ifnull(sum(deliver_full_day), 0) as deliver_full_day,
ifnull(sum(deliver_subtotal_day), 0) as deliver_subtotal_day,
ifnull(sum(deliver_loan_month), 0) as deliver_loan_month,
ifnull(sum(deliver_full_month), 0) as deliver_full_month,
ifnull(sum(deliver_subtotal_month), 0) as deliver_subtotal_month,
ifnull(sum(deliver_loan_year), 0) as deliver_loan_year,
ifnull(sum(deliver_full_year), 0) as deliver_full_year,
ifnull(sum(deliver_subtotal_year), 0) as deliver_subtotal_year,
ifnull(sum(manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
ifnull(sum(buyout_day), 0) as buyout_day,
ifnull(sum(buyout_month), 0) as buyout_month,
ifnull(sum(buyout_year), 0) as buyout_year,
ifnull(sum(arrears_carry_veh_count), 0) as arrears_carry_veh_count,
ifnull(sum(arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
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,
ifnull(sum(loan_not_counts), 0) as loan_not_counts,
ifnull(sum(loan_not_amounts), 0) as loan_not_amounts
from daily_report
where createTime between #{startDate} and #{endDate}
and busOrgSid = #{busOrgSid}
group by useOrgSid
order by useOrgSid desc
</select>
<select id="selectByBrand2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
SELECT dr.brandSid linkSid,
dr.brandName NAME,
@ -650,6 +875,34 @@
order by dr.brandSid desc
</select>
<select id="selectByBrand2New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
SELECT dr.brandSid linkSid,
dr.brandName NAME,
b.colspan
FROM daily_report dr
left join
(
select count(a.brandSid) as colspan,
a.brandSid
from (SELECT ddr.brandSid
FROM daily_report ddr
left join
anrui_base.base_model_config bmc
on ddr.vehMConfigSid = bmc.sid
left join
anrui_base.base_vehicle_model bm
on bm.sid = ddr.vehModelSid
<where>
${ew.sqlSegment}
</where>) a
group by a.brandSid) b
on b.brandSid = dr.brandSid
WHERE dr.useOrgSid = #{useOrgSid}
AND dr.createTime between #{startDate} and #{endDate}
GROUP BY dr.brandSid
order by dr.brandSid desc
</select>
<select id="selectReport4" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select <!--ifnull(dr.saleOfStockRatio, 0) as saleOfStockRatio,
ifnull(dr.stock_total, 0) as stock_total,
@ -813,4 +1066,175 @@
${ew.sqlSegment}
</where>
</select>
<select id="selectReport4New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select
ifnull(sum(dr.saleOfStockRatio), 0) as saleOfStockRatio,
ifnull(sum(dr.stock_total), 0) as stock_total,
ifnull(sum(dr.stock_unreserve), 0) as stock_unreserve,
ifnull(sum(dr.stock_reserve), 0) as stock_reserve,
ifnull(sum(dr.stock_subtotal), 0) as stock_subtotal,
ifnull(sum(dr.stock_buyout_unreserve), 0) as stock_buyout_unreserve,
ifnull(sum(dr.stock_buyout_reserve), 0) as stock_buyout_reserve,
ifnull(sum(dr.stock_buyout_subtotal), 0) as stock_buyout_subtotal,
ifnull(sum(dr.pcOrder_unreserve), 0) as pcOrder_unreserve,
ifnull(sum(dr.pcOrder_reserve), 0) as pcOrder_reserve,
ifnull(sum(dr.pcOrder_subtotal), 0) as pcOrder_subtotal,
ifnull(sum(dr.simpleOrder_day), 0) as simpleOrder_day,
ifnull(sum(dr.simpleOrder_month), 0) as simpleOrder_month,
ifnull(sum(dr.saleOrder_full_day), 0) as saleOrder_full_day,
ifnull(sum(dr.saleOrder_loan_day), 0) as saleOrder_loan_day,
ifnull(sum(dr.saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
ifnull(sum(dr.saleOrder_full_month), 0) as saleOrder_full_month,
ifnull(sum(dr.saleOrder_loan_month), 0) as saleOrder_loan_month,
ifnull(sum(dr.saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
ifnull(sum(dr.saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
ifnull(sum(dr.sale_full_day), 0) as sale_full_day,
ifnull(sum(dr.sale_loan_day), 0) as sale_loan_day,
ifnull(sum(dr.sale_subtotal_day), 0) as sale_subtotal_day,
ifnull(sum(dr.sale_full_month), 0) as sale_full_month,
ifnull(sum(dr.sale_loan_month), 0) as sale_loan_month,
ifnull(sum(dr.sale_subtotal_month), 0) as sale_subtotal_month,
ifnull(sum(dr.sale_full_year), 0) as sale_full_year,
ifnull(sum(dr.sale_loan_year), 0) as sale_loan_year,
ifnull(sum(dr.sale_subtotal_year), 0) as sale_subtotal_year,
ifnull(sum(dr.manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
ifnull(sum(dr.buyout_day), 0) as buyout_day,
ifnull(sum(dr.buyout_month), 0) as buyout_month,
ifnull(sum(dr.buyout_year), 0) as buyout_year,
ifnull(sum(dr.arrears_carry_veh_count), 0) as arrears_carry_veh_count,
ifnull(sum(dr.arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
ifnull(sum(dr.loan_not_count), 0) as loan_not_count,
ifnull(sum(dr.loan_not_amount), 0) as loan_not_amount,
dr.remarks,
ifnull(sum(dr.deliver_loan_day), 0) as deliver_loan_day,
ifnull(sum(dr.deliver_full_day), 0) as deliver_full_day,
ifnull(sum(dr.deliver_subtotal_day), 0) as deliver_subtotal_day,
ifnull(sum(dr.deliver_loan_month), 0) as deliver_loan_month,
ifnull(sum(dr.deliver_full_month), 0) as deliver_full_month,
ifnull(sum(dr.deliver_subtotal_month), 0) as deliver_subtotal_month,
ifnull(sum(dr.deliver_loan_year), 0) as deliver_loan_year,
ifnull(sum(dr.deliver_full_year), 0) as deliver_full_year,
ifnull(sum(dr.deliver_subtotal_year), 0) as deliver_subtotal_year,
ifnull(sum(dr.saleAllToThree), 0) as saleAllToThree
,
ifnull(sum(dr.loan_not_counts), 0) as loan_not_counts,
ifnull(sum(dr.loan_not_amounts), 0) as loan_not_amounts,
bm.fuelTypeValue,
bm.emissionStandardValue,
bmc.carColor,
bmc.specification,
bmc.fuelTank,
bmc.baffleModel,
bmc.independentSources,
bmc.tireCover,
bmc.saddle,
bmc.airConditioner,
bmc.rearAxleRatio,
bmc.rearAxleValue,
bmc.tireSize,
bmc.slowMachine,
bmc.rearViewMirror,
bmc.wheelbase,
bmc.suspension,
bmc.packingCase,
bmc.seat,
bmc.hubMaterial,
bmc.configuringBao,
bmc.multimedia,
bmc.bumper,
bmc.clutchValue,
bmc.dirMachineValue,
bmc.proponsValue,
bmc.doorAndWindowValue,
bmc.doorLockValue,
bmc.headlightValue,
bmc.boardPedalValue,
bmc.steerWheelValue,
bmc.storagBatteryValue,
bmc.comfortPackValue,
bmc.cheBasePackValue,
bmc.savingPackValue,
bmc.conPackValue,
bm.vehicleTypeValue,
bm.emissionStandardValue,
bm.productLineValue,
bm.driveFormValue,
bm.powerValue,
bm.tranCaseTypeValue,
bm.gearboxTypeValue,
bm.fuelTypeValue,
bm.vehicleVersionValue,
bm.engineTypeValue,
bm.specifications,
dr.brandSid
from daily_report dr
left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectRecordList" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo" parameterType="java.util.Map">
select DATE(createTime) as date,
sum(saleOfStockRatio) as saleOfStockRatio,
sum(stock_subtotal) as stock_subtotal,
sum(pcOrder_subtotal) as pcOrder_subtotal,
sum(saleOrder_subtotal_day) as saleOrder_subtotal_day,
sum(sale_subtotal_day) as sale_subtotal_day,
sum(arrears_carry_veh_amount) as arrears_carry_veh_amount,
sum(loan_not_amount) as loan_not_amount,
ifnull(sum(loan_not_amounts), 0) as loan_not_amounts,
sum(buyout_day) as buyout_day,
sum(saleAllToThree) as saleAllToThree,
SUM(stock_total) as stock_total,
useOrgSid
from daily_report
<where>
${ew.sqlSegment}
</where>
group by createTime
order by createTime desc
LIMIT #{map.page},#{map.size}
</select>
<select id="selectRecordCount" resultType="int">
SELECT COUNT(DISTINCT DATE(createTime))
FROM daily_report
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectRecordList2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo" parameterType="java.util.Map">
select DATE(createTime) as date,
sum(saleOfStockRatio) as saleOfStockRatio,
sum(stock_subtotal) as stock_subtotal,
sum(pcOrder_subtotal) as pcOrder_subtotal,
sum(saleOrder_subtotal_day) as saleOrder_subtotal_day,
sum(sale_subtotal_day) as sale_subtotal_day,
<!-- sum(arrears_carry_veh_amount) as arrears_carry_veh_amount,-->
sum(COALESCE(arrears_carry_veh_amount,0)) as arrears_carry_veh_amount,
sum(loan_not_amount) as loan_not_amount,
<!--ifnull(sum(loan_not_amounts), 0) as loan_not_amounts,-->
sum(COALESCE(loan_not_amounts,0)) as loan_not_amounts,
sum(buyout_day) as buyout_day,
sum(saleAllToThree) as saleAllToThree,
SUM(stock_total) as stock_total,
useOrgSid,
busOrgSid
from daily_report
<where>
${ew.sqlSegment}
</where>
group by createTime
order by createTime desc
LIMIT #{map.page},#{map.size}
</select>
<select id="selectRecordList3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
</select>
</mapper>

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

@ -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

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

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save