优化班结，日报查询

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

@@ -44,6 +44,16 @@ public class PayOrderController extends BaseController
         List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
         return getDataTable(list);
     }
+    /**
+     * 查询订单支付列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:listInfo')")
+    @GetMapping("/listInfo")
+    public TableDataInfo listInfo(PayOrder payOrder)
+    {
+        List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
+        return getTable(list);
+    }
 
     /**
      * 查询总金额，总升数

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

@@ -167,12 +167,12 @@ public class StationClassStructureController extends BaseController
             }
         }
         int i=0;
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(sss!=null){
             //获取上次班结时间
             PayOrder order=new PayOrder();
             order.setStationId(stationId);
             order.setStatus("1");
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             beginTime= dateFormat.format(sss.getClassStructureDate());
             order.setBeginTime(beginTime);
             order.setEndTime( dateFormat.format(date));
@@ -270,7 +270,7 @@ public class StationClassStructureController extends BaseController
             //根据班结时间查询订单
             PayOrder order=new PayOrder();
             order.setStationId(stationId);
-            order.setEndTime(date.toString());
+            order.setEndTime(dateFormat.format(date));
             List<PayOrder> list = payOrderService.selectPayOrderList(order);
             for(PayOrder payOrder:list){
                 StationClassStructure stationclass =new StationClassStructure();
@@ -355,11 +355,14 @@ public class StationClassStructureController extends BaseController
             List<StationClassStructure>  list= stationClassStructureService.listOilStructure(classStructure);
             //查询出小票数据
             String content;
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             content = "<CB>班结小票</CB><BR>";
             content += "--------------------------------<BR>";
             if(list!=null && list.size()>0){
-                content += "开始时间："+dateFormat.format(list.get(0).getClassStartDate())+"  <BR>";
+                if(list.get(0).getClassStartDate()!=null){
+                    content += "开始时间："+dateFormat.format(list.get(0).getClassStartDate())+"  <BR>";
+                }else{
+                    content += "开始时间： <BR>";
+                }
                 content += "班结时间："+dateFormat.format(list.get(0).getClassStructureDate())+" <BR>";
                 content += "油品  升数  金额  单数  优惠  <BR>";
                 content += "--------------------------------<BR>";

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

@@ -41,6 +41,7 @@ public class StationClassesSummaryController extends BaseController
     public TableDataInfo list(StationClassesSummary stationClassesSummary)
     {
         startPage();
+        stationClassesSummary.setStationId(Long.valueOf("5"));
         List<StationClassesSummary> list = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
         return getDataTable(list);
     }

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

@@ -107,7 +107,7 @@ public class StationDeviceManageController extends BaseController
     /**
      * 状态修改
      */
-    @PreAuthorize("@ss.hasPermi('station:manage:edit')")
+    @PreAuthorize("@ss.hasPermi('station:manage:changeManageStatus')")
     @Log(title = "油站设备管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeManageStatus")
     public AjaxResult changeManageStatus(@RequestBody StationDeviceManage stationDeviceManage)

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

@@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wxNum"    column="wx_num"    />
         <result property="zfbNum"    column="zfb_num"    />
         <result property="xjNum"    column="xj_num"  />
+        <result property="qyAmt"    column="qy_amt"  />
+        <result property="cyAmt"    column="cy_amt"  />
     </resultMap>
 
 
@@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         order by order_id desc
     </select>
@@ -206,15 +209,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        SELECT date_format( b.created_date, '%Y-%m-%d' ) as created_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,sum(receivable_amt) as receivable_amt,sum(received_amt) as received_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
+        GROUP BY  date_format( created_date, '%Y-%m-%d' )
+        ORDER BY date_format( created_date, '%Y-%m-%d' ) DESC
     </select>
 <!-- 日报折线图油品数据-->
     <select id="listQydata" parameterType="Long" resultMap="PayOrderResult">
@@ -222,6 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from pay_order
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</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')
@@ -238,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from pay_order
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</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>