修改根据站点查询，增加打印小票

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

@@ -859,6 +859,7 @@ public class PayOrderController extends BaseController
                 }
                 content1 += "支付： "+order.getAmt()+" 元<BR>";
                 content1 += "手机号： "+phoneNumber +" <BR>";
+                content1 += "加油员： "+order.getOilPersonnel() +" <BR>";
                 content1 += "<BR>";
 
                 content2 = "<CB>油品订单--商户联</CB><BR>";

yijia-station/src/main/java/com/yijia/station/controller/StationBalanceChangeController.java

@@ -49,7 +49,7 @@ public class StationBalanceChangeController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationBalanceChange stationBalanceChange)
     {
-        List<String> list = deptService.selectdeptInfoList(new SysDept());
+        List<String> list = deptService.levelDeptList(stationBalanceChange.getLevelId());
         if(list!=null && list.size()>0){
             stationBalanceChange.setStationIdList(list);
             stationBalanceChange.setStationId(null);
@@ -66,7 +66,7 @@ public class StationBalanceChangeController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationBalanceChange stationBalanceChange)
     {
-        List<String> list = deptService.selectdeptInfoList(new SysDept());
+        List<String> list = deptService.levelDeptList(stationBalanceChange.getLevelId());
         if(list!=null && list.size()>0){
             stationBalanceChange.setStationIdList(list);
             stationBalanceChange.setStationId(null);

yijia-station/src/main/java/com/yijia/station/controller/StationSettlementPriceAdjustController.java

@@ -46,7 +46,7 @@ public class StationSettlementPriceAdjustController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationSettlementPriceAdjust stationSettlementPriceAdjust)
     {
-        List<String> list = deptService.selectdeptInfoList(new SysDept());
+        List<String> list = deptService.levelDeptList(stationSettlementPriceAdjust.getLevelId());
         if(list!=null && list.size()>0){
             stationSettlementPriceAdjust.setStationIdList(list);
             stationSettlementPriceAdjust.setStationId(null);

yijia-station/src/main/resources/mapper/station/StationBalanceChangeMapper.xml

@@ -18,8 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectStationBalanceChangeVo">
         select c.id, c.station_id, c.order_no, c.type, c.amt, c.create_time, c.create_by,dept_name as station_name,u.nick_name as create_name
-		from station_balance_change c  join sys_dept d on c.station_id = d.dept_id
-		join sys_user u on c.create_by =u.user_id
+		from station_balance_change c
+		left join sys_dept d on c.station_id = d.dept_id
+		left join sys_user u on c.create_by =u.user_id
     </sql>
 
     <select id="selectStationBalanceChangeList" parameterType="StationBalanceChange" resultMap="StationBalanceChangeResult">
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectStationBalanceChangeById" parameterType="Long" resultMap="StationBalanceChangeResult">

yijia-station/src/main/resources/mapper/station/StationSettlementPriceAdjustMapper.xml

@@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectStationSettlementPriceAdjustVo">
         select c.id, c.create_by, c.create_time,c.parent_id, c.settlement_price, c.settlement_type,
          c.driver_price,c.station_id,dept_name as station_name,u.nick_name as create_name
-		from station_settlement_price_adjust c  join sys_dept d on c.station_id = d.dept_id
-		join sys_user u on c.create_by =u.user_id
+		from station_settlement_price_adjust c left join sys_dept d on c.station_id = d.dept_id
+		left join sys_user u on c.create_by =u.user_id
     </sql>
 
     <select id="selectStationSettlementPriceAdjustList" parameterType="StationSettlementPriceAdjust" resultMap="StationSettlementPriceAdjustResult">
@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectStationSettlementPriceAdjustById" parameterType="Integer" resultMap="StationSettlementPriceAdjustResult">