日报折线图展示

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -125,6 +125,57 @@ public class PayOrderController extends BaseController
     }
 
     /**
+     * 获取92号汽油数据
+     * @param payOrder
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:listQydata92')")
+    @GetMapping("/listQydata92")
+    public TableDataInfo listQydata92(PayOrder payOrder)
+    {
+        payOrder.setOilName("92#");
+        List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
+        return getTable(orderList);
+    }
+    /**
+     * 获取95号汽油数据
+     * @param payOrder
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:listQydata95')")
+    @GetMapping("/listQydata95")
+    public TableDataInfo listQydata95(PayOrder payOrder)
+    {
+        payOrder.setOilName("95#");
+        List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
+        return getTable(orderList);
+    }
+    /**
+     * 获取97号汽油数据
+     * @param payOrder
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:listQydata97')")
+    @GetMapping("/listQydata97")
+    public TableDataInfo listQydata97(PayOrder payOrder)
+    {
+        payOrder.setOilName("97#");
+        List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
+        return getTable(orderList);
+    }
+    /**
+     * 获取x轴数据
+     * @param payOrder
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:listXdata')")
+    @GetMapping("/listXdata")
+    public TableDataInfo listXdata(PayOrder payOrder)
+    {
+        List<PayOrder>  orderList = payOrderService.listXdata(payOrder);
+        return getTable(orderList);
+    }
+    /**
      * 新增订单支付
      */
     @PreAuthorize("@ss.hasPermi('station:order:add')")

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java

@@ -86,4 +86,17 @@ public interface PayOrderMapper
      * @return
      */
     public List<PayOrder> selectDayReport(PayOrder payOrder);
+
+    /**
+     * 日报折线图获取油品数据
+     * @param payOrder
+     * @return
+     */
+    public List<PayOrder> listQydata(PayOrder payOrder);
+    /**
+     * 获取x轴数据
+     * @param payOrder
+     * @return
+     */
+    public List<PayOrder> listXdata(PayOrder payOrder);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IPayOrderService.java

@@ -81,4 +81,17 @@ public interface IPayOrderService
     public  PayOrder selectOverViewData(PayOrder payOrder);
 
     public List<PayOrder> selectDayReport(PayOrder payOrder);
+    /**
+     * 日报折线图获取油品数据
+     * @param payOrder
+     * @return
+     */
+    public List<PayOrder> listQydata(PayOrder payOrder);
+
+    /**
+     * 获取x轴数据
+     * @param payOrder
+     * @return
+     */
+    public List<PayOrder> listXdata(PayOrder payOrder);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java

@@ -131,6 +131,23 @@ public class PayOrderServiceImpl implements IPayOrderService
     public List<PayOrder> selectDayReport(PayOrder payOrder) {
         return payOrderMapper.selectDayReport(payOrder);
     }
-
+    /**
+     * 日报折线图获取油品数据
+     * @param payOrder
+     * @return
+     */
+    @Override
+    public List<PayOrder> listQydata(PayOrder payOrder) {
+        return payOrderMapper.listQydata(payOrder);
+    }
+    /**
+     * 获取x轴数据
+     * @param payOrder
+     * @return
+     */
+    @Override
+    public List<PayOrder> listXdata(PayOrder payOrder) {
+        return payOrderMapper.listXdata(payOrder);
+    }
 
 }

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -105,10 +105,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="createdDate != null "> and created_date like concat(#{createdDate}, '%') </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
     </select>
@@ -118,10 +118,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
         GROUP BY oil_type
@@ -132,19 +132,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
     </select>
+    <!--日报数据-->
     <select id="selectDayReport" parameterType="Long" resultMap="PayOrderResult">
         SELECT date_format( b.pay_date, '%Y-%m-%d' ) as pay_date,sum(b.amt) as amt,sum(b.qyamt) as qy_amt, sum(b.cyamt) as cy_amt,sum(b.order_liters) as order_liters ,count(b.order_no) order_no ,sum(b.member_amt) as menber_amt
         from (SELECT a.*,(SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=2) as qyamt , (SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=1) as cyamt
         from pay_order a) b
         GROUP BY  date_format( pay_date, '%Y-%m-%d' )
     </select>
+<!-- 日报折线图油品数据-->
+    <select id="listQydata" parameterType="Long" resultMap="PayOrderResult">
+        SELECT sum(amt) as amt,date_format(created_date,'%Y-%m-%d')  as created_date
+        from pay_order
+        <where>
+            <if test="oilName != null "> and oil_name = #{oilName}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY oil_name ,date_format(created_date,'%Y-%m-%d')
+    </select>
+<!-- 日报折线图X轴数据-->
+    <select id="listXdata" parameterType="Long" resultMap="PayOrderResult">
+        SELECT date_format(created_date,'%Y-%m-%d')  as created_date
+        from pay_order
+        <where>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY date_format(created_date,'%Y-%m-%d')
+    </select>
     <insert id="insertPayOrder" parameterType="PayOrder" useGeneratedKeys="true" keyProperty="orderId">
         insert into pay_order
         <trim prefix="(" suffix=")" suffixOverrides=",">

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml

@@ -41,6 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
             <if test="classesMan != null  and classesMan != ''"> and classes_man = #{classesMan}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(endDate,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(endDate,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
         </where>
         order by id desc
     </select>