优化日结报表

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

@@ -54,6 +54,9 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDaySources")
     public AjaxResult selectDaySources(PayOrder payOrder)
     {
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         PayOrder order = payOrderService.selectDaySources(payOrder);
         return AjaxResult.success(order);
     }
@@ -67,6 +70,9 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectOilTypeSources")
     public TableDataInfo selectOilTypeSources(PayOrder payOrder)
     {
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder> orderList = payOrderService.selectOilTypeSources(payOrder);
         return getTable(orderList);
     }
@@ -80,6 +86,9 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectOverViewData")
     public AjaxResult selectOverViewData(PayOrder payOrder)
     {
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         PayOrder order = payOrderService.selectOverViewData(payOrder);
         return AjaxResult.success(order);
     }
@@ -97,6 +106,9 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDayReport")
     public TableDataInfo selectDayReport(PayOrder payOrder)
     {
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
        List<PayOrder>  orderList = payOrderService.selectDayReport(payOrder);
         return getTable(orderList);
     }
@@ -136,6 +148,13 @@ public class PayOrderController extends BaseController
     public TableDataInfo listQydata92(PayOrder payOrder)
     {
         payOrder.setOilName("92#");
+        //获取当前登陆所属stationId
+       // LoginUser currentUser = SecurityUtils.getLoginUser();
+        // 获取当前的用户名称
+       // String userName = currentUser.getUsername();
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
     }
@@ -149,6 +168,9 @@ public class PayOrderController extends BaseController
     public TableDataInfo listQydata95(PayOrder payOrder)
     {
         payOrder.setOilName("95#");
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
     }
@@ -162,6 +184,9 @@ public class PayOrderController extends BaseController
     public TableDataInfo listQydata97(PayOrder payOrder)
     {
         payOrder.setOilName("97#");
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
     }
@@ -176,6 +201,9 @@ public class PayOrderController extends BaseController
     public TableDataInfo listQydata20(PayOrder payOrder)
     {
         payOrder.setOilName("-20#");
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
     }
@@ -189,6 +217,9 @@ public class PayOrderController extends BaseController
     public TableDataInfo listQydata0(PayOrder payOrder)
     {
         payOrder.setOilName("0#");
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
     }
@@ -202,6 +233,9 @@ public class PayOrderController extends BaseController
     public TableDataInfo listQydata10(PayOrder payOrder)
     {
         payOrder.setOilName("-10#");
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);
         return getTable(orderList);
     }
@@ -214,6 +248,9 @@ public class PayOrderController extends BaseController
     @GetMapping("/listXdata")
     public TableDataInfo listXdata(PayOrder payOrder)
     {
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
         List<PayOrder>  orderList = payOrderService.listXdata(payOrder);
         return getTable(orderList);
     }

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

@@ -508,6 +508,7 @@ public class StationClassStructureController extends BaseController
            //根据上次班结时间，和油站去订单表中查询数据，并按照人员汇总数据
             PayOrder payOrder =new PayOrder();
             payOrder.setStatus("1");
+            payOrder.setStationId(stationClassStructure.getStationId());
             List<PayOrder> payOrderList =  payOrderService.selectPersonnelStructure(payOrder);
             for(PayOrder order:payOrderList){
                 StationClassStructure classStructure =new StationClassStructure();
@@ -556,6 +557,7 @@ public class StationClassStructureController extends BaseController
        }else{
            PayOrder payOrder =new PayOrder();
            payOrder.setStatus("1");
+           payOrder.setStationId(stationClassStructure.getStationId());
            List<PayOrder> payOrderList =  payOrderService.selectOilStructure(payOrder);
            for(PayOrder order:payOrderList){
                StationClassStructure classStructure =new StationClassStructure();
@@ -612,6 +614,7 @@ public class StationClassStructureController extends BaseController
         }else{
             PayOrder payOrder =new PayOrder();
             payOrder.setStatus("1");
+            payOrder.setStationId(stationClassStructure.getStationId());
             List<PayOrder> payOrderList =  payOrderService.selectPersonnelPayStructure(payOrder);
             for(PayOrder order:payOrderList){
                 StationClassStructure classStructure =new StationClassStructure();

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

@@ -162,6 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT SUM(amt) as amt,sum(order_liters) as order_liters
         from pay_order
         <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</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')
@@ -175,6 +177,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT SUM(amt) as amt,sum(order_liters) as order_liters, oil_type
         from pay_order
         <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
             <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')
@@ -189,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT SUM(wx_amt) as wx_amt,sum(zfb_amt) as zfb_amt, sum(pos_amt) as pos_amt, sum(xj_amt) as xj_amt,sum(didi_app_amt) as didi_app_amt,sum(ty_app_amt) as ty_app_amt,sum(other_amt) as other_amt,sum(member_amt) as member_amt
         from pay_order
         <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
             <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')
@@ -203,13 +209,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
         GROUP BY  date_format( pay_date, '%Y-%m-%d' )
+        ORDER BY date_format( pay_date, '%Y-%m-%d' ) DESC
     </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="stationId != null "> and station_id = #{stationId}</if>
             <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')
@@ -225,6 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT date_format(created_date,'%Y-%m-%d')  as created_date
         from pay_order
         <where>
+            <if test="stationId != null "> and station_id = #{stationId}</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>