营销管理

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

@@ -65,10 +65,10 @@ public class PayOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('station:order:selectOilTypeSources')")
     @GetMapping("/selectOilTypeSources")
-    public AjaxResult selectOilTypeSources(PayOrder payOrder)
+    public TableDataInfo selectOilTypeSources(PayOrder payOrder)
     {
-        PayOrder order = payOrderService.selectOilTypeSources(payOrder);
-        return AjaxResult.success(order);
+        List<PayOrder> orderList = payOrderService.selectOilTypeSources(payOrder);
+        return getTable(orderList);
     }
 
     /***

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

@@ -71,7 +71,7 @@ public interface PayOrderMapper
      * @param payOrder
      * @return
      */
-    public PayOrder selectOilTypeSources(PayOrder payOrder);
+    public  List<PayOrder> selectOilTypeSources(PayOrder payOrder);
 
     /**
      * 收入概览

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

@@ -71,7 +71,7 @@ public interface IPayOrderService
      * @param payOrder
      * @return
      */
-    public PayOrder selectOilTypeSources(PayOrder payOrder);
+    public List<PayOrder> selectOilTypeSources(PayOrder payOrder);
 
     /**
      * 收入数据概览，获取数据

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

@@ -107,7 +107,7 @@ public class PayOrderServiceImpl implements IPayOrderService
      * @return
      */
     @Override
-    public PayOrder selectOilTypeSources(PayOrder payOrder) {
+    public  List<PayOrder>  selectOilTypeSources(PayOrder payOrder) {
         return payOrderMapper.selectOilTypeSources(payOrder);
     }
 

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

@@ -98,10 +98,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where order_id = #{orderId}
     </select>
     <select id="selectDaySources" parameterType="Long" resultMap="PayOrderResult">
-        SELECT SUM(amt) as amt,sum(order_liters) as liters
+        SELECT SUM(amt) as amt,sum(order_liters) as order_liters
         from pay_order
         <where>
-            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+            <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')
             </if>
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="selectOilTypeSources" parameterType="Long" resultMap="PayOrderResult">
-        SELECT SUM(amt) as amt,sum(order_liters) as liters, oil_type
+        SELECT SUM(amt) as amt,sum(order_liters) as order_liters, oil_type
         from pay_order
         <where>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>