修改班结

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

@@ -2,8 +2,6 @@ package com.yijia.station.controller;
 
 import java.util.List;
 
-import com.yijia.common.core.domain.model.LoginUser;
-import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -287,6 +285,18 @@ public class PayOrderController extends BaseController
         return getTable(orderList);
     }
     /**
+     * 查询油站第一笔订单的数据
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:getPayOrderInfoMin')")
+    @GetMapping("/getPayOrderInfoMin")
+    public AjaxResult getPayOrderInfoMin(PayOrder payOrder)
+    {
+        //默认当前登陆人的ID 5冯总油站
+        payOrder.setStationId(Long.valueOf("5"));
+        payOrder.setStatus("1");
+        return  AjaxResult.success(payOrderService.getPayOrderInfoMin(payOrder));
+    }
+    /**
      * 新增订单支付
      */
     @PreAuthorize("@ss.hasPermi('station:order:add')")

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

@@ -168,6 +168,7 @@ public class StationClassStructureController extends BaseController
         }
         int i=0;
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat dfe = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(sss!=null){
             //获取上次班结时间
             PayOrder order=new PayOrder();
@@ -176,7 +177,6 @@ public class StationClassStructureController extends BaseController
             beginTime= dateFormat.format(sss.getClassStructureDate());
             order.setBeginTime(beginTime);
             order.setEndTime( dateFormat.format(date));
-            SimpleDateFormat dfe = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             List<PayOrder> list = payOrderService.selectPayOrderList(order);
             for(PayOrder payOrder:list){
                 StationClassStructure stationclass =new StationClassStructure();
@@ -273,102 +273,111 @@ public class StationClassStructureController extends BaseController
             }
         }else{
             //初次班结 班结时间默认为当前时间，班结人username
-            //根据班结时间查询订单
-            PayOrder order=new PayOrder();
-            order.setStationId(stationId);
-            order.setEndTime(dateFormat.format(date));
-            List<PayOrder> list = payOrderService.selectPayOrderList(order);
-            for(PayOrder payOrder:list){
-                StationClassStructure stationclass =new StationClassStructure();
-                stationclass.setStationId(payOrder.getStationId());
-                stationclass.setStationName(payOrder.getStationName());
-                stationclass.setClassStructureMan(username);
-                stationclass.setClassStructureDate(date);
-                stationclass.setClassStructureNo(no);
-                stationclass.setOrderNo(payOrder.getOrderNo());
-                stationclass.setOilGun(payOrder.getOilGun());
-                stationclass.setOilName(payOrder.getOilName());
-                stationclass.setConsumerId(payOrder.getConsumerId());
-                stationclass.setConsumer(payOrder.getConsumer());
-                stationclass.setAmt(payOrder.getAmt());
-                if(payOrder.getReceivableAmt()!=null){
-                    stationclass.setReceivableAmt(payOrder.getReceivableAmt());
-                }else{
-                    stationclass.setReceivableAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getReceivedAmt()!=null){
-                    stationclass.setReceivedAmt(payOrder.getReceivedAmt());
-                }else{
-                    stationclass.setReceivedAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDiscountAmt()!=null){
-                    stationclass.setDiscountAmt(payOrder.getDiscountAmt());
-                }else{
-                    stationclass.setDiscountAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDiscountCouponAmt()!=null){
-                    stationclass.setDiscountCouponAmt(payOrder.getDiscountCouponAmt());
-                }else{
-                    stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getWxAmt()!=null){
-                    stationclass.setWxAmt(payOrder.getWxAmt());
-                }else{
-                    stationclass.setWxAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getZfbAmt()!=null){
-                    stationclass.setZfbAmt(payOrder.getZfbAmt());
-                }else{
-                    stationclass.setZfbAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getPosAmt()!=null){
-                    stationclass.setPosAmt(payOrder.getPosAmt());
-                }else{
-                    stationclass.setPosAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getXjAmt()!=null){
-                    stationclass.setXjAmt(payOrder.getXjAmt());
-                }else{
-                    stationclass.setXjAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDidiAppAmt()!=null){
-                    stationclass.setDidiAppAmt(payOrder.getDidiAppAmt());
-                }else{
-                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getTyAppAmt()!=null){
-                    stationclass.setDidiAppAmt(payOrder.getTyAppAmt());
-                }else{
-                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getOtherAmt()!=null){
-                    stationclass.setOtherAmt(payOrder.getOtherAmt());
-                }else{
-                    stationclass.setOtherAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDzkAmt()!=null){
-                    stationclass.setDzkAmt(payOrder.getDzkAmt());
-                }else{
-                    stationclass.setDzkAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getMemberAmt()!=null){
-                    stationclass.setMemberAmt(payOrder.getMemberAmt());
-                }else{
-                    stationclass.setMemberAmt(BigDecimal.valueOf(0));
-                }
-                stationclass.setOrderLiters(payOrder.getOrderLiters());
-                stationclass.setPayWay(payOrder.getPayWay());
-                stationclass.setPayType(payOrder.getPayType());
-                stationclass.setPayDate(payOrder.getPayDate());
-                stationclass.setOilPersonnel(payOrder.getOilPersonnel());
-                stationclass.setOrderType(payOrder.getOrderType());
-                if(payOrder.getPrintCount()!=null){
-                    stationclass.setPrintNum(payOrder.getPrintCount());
-                }else{
-                    stationclass.setPrintNum(Long.valueOf("0"));
+            PayOrder p =new  PayOrder();
+            p.setStationId(Long.valueOf("5"));
+            p.setStatus("1");
+            PayOrder orders= payOrderService.getPayOrderInfoMin(p);
+            if(orders!=null){
+                //根据班结时间查询订单
+                PayOrder order=new PayOrder();
+                beginTime= dateFormat.format(orders.getCreatedDate());
+                order.setStationId(stationId);
+                order.setEndTime(dateFormat.format(date));
+                List<PayOrder> list = payOrderService.selectPayOrderList(order);
+                for(PayOrder payOrder:list){
+                    StationClassStructure stationclass =new StationClassStructure();
+                    stationclass.setStationId(payOrder.getStationId());
+                    stationclass.setClassStartDate(dfe.parse(beginTime));
+                    stationclass.setStationName(payOrder.getStationName());
+                    stationclass.setClassStructureMan(username);
+                    stationclass.setClassStructureDate(date);
+                    stationclass.setClassStructureNo(no);
+                    stationclass.setOrderNo(payOrder.getOrderNo());
+                    stationclass.setOilGun(payOrder.getOilGun());
+                    stationclass.setOilName(payOrder.getOilName());
+                    stationclass.setConsumerId(payOrder.getConsumerId());
+                    stationclass.setConsumer(payOrder.getConsumer());
+                    stationclass.setAmt(payOrder.getAmt());
+                    if(payOrder.getReceivableAmt()!=null){
+                        stationclass.setReceivableAmt(payOrder.getReceivableAmt());
+                    }else{
+                        stationclass.setReceivableAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getReceivedAmt()!=null){
+                        stationclass.setReceivedAmt(payOrder.getReceivedAmt());
+                    }else{
+                        stationclass.setReceivedAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getDiscountAmt()!=null){
+                        stationclass.setDiscountAmt(payOrder.getDiscountAmt());
+                    }else{
+                        stationclass.setDiscountAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getDiscountCouponAmt()!=null){
+                        stationclass.setDiscountCouponAmt(payOrder.getDiscountCouponAmt());
+                    }else{
+                        stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getWxAmt()!=null){
+                        stationclass.setWxAmt(payOrder.getWxAmt());
+                    }else{
+                        stationclass.setWxAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getZfbAmt()!=null){
+                        stationclass.setZfbAmt(payOrder.getZfbAmt());
+                    }else{
+                        stationclass.setZfbAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getPosAmt()!=null){
+                        stationclass.setPosAmt(payOrder.getPosAmt());
+                    }else{
+                        stationclass.setPosAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getXjAmt()!=null){
+                        stationclass.setXjAmt(payOrder.getXjAmt());
+                    }else{
+                        stationclass.setXjAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getDidiAppAmt()!=null){
+                        stationclass.setDidiAppAmt(payOrder.getDidiAppAmt());
+                    }else{
+                        stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getTyAppAmt()!=null){
+                        stationclass.setDidiAppAmt(payOrder.getTyAppAmt());
+                    }else{
+                        stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getOtherAmt()!=null){
+                        stationclass.setOtherAmt(payOrder.getOtherAmt());
+                    }else{
+                        stationclass.setOtherAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getDzkAmt()!=null){
+                        stationclass.setDzkAmt(payOrder.getDzkAmt());
+                    }else{
+                        stationclass.setDzkAmt(BigDecimal.valueOf(0));
+                    }
+                    if(payOrder.getMemberAmt()!=null){
+                        stationclass.setMemberAmt(payOrder.getMemberAmt());
+                    }else{
+                        stationclass.setMemberAmt(BigDecimal.valueOf(0));
+                    }
+                    stationclass.setOrderLiters(payOrder.getOrderLiters());
+                    stationclass.setPayWay(payOrder.getPayWay());
+                    stationclass.setPayType(payOrder.getPayType());
+                    stationclass.setPayDate(payOrder.getPayDate());
+                    stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                    stationclass.setOrderType(payOrder.getOrderType());
+                    if(payOrder.getPrintCount()!=null){
+                        stationclass.setPrintNum(payOrder.getPrintCount());
+                    }else{
+                        stationclass.setPrintNum(Long.valueOf("0"));
+                    }
+                    i= stationClassStructureService.insertStationClassStructure(stationclass);
                 }
-                i= stationClassStructureService.insertStationClassStructure(stationclass);
             }
+
         }
         StationClassStructure scs =new StationClassStructure();
         scs.setClassStructureNo(no);
@@ -383,7 +392,6 @@ public class StationClassStructureController extends BaseController
             if(stationclass.getClassStructureDate()!=null){
                 stationClassesSummary.setEndDate(stationclass.getClassStructureDate());
             }
-
             stationClassesSummary.setStationName(stationclass.getStationName());
             if(stationclass.getStationId()!=null){
                 stationClassesSummary.setStationId(stationclass.getStationId());
@@ -416,6 +424,12 @@ public class StationClassStructureController extends BaseController
             }else{
                 stationClassesSummary.setWxAmt(BigDecimal.valueOf(0));
             }
+            if(stationclass.getPrintNum()!=null){
+                stationClassesSummary.setPrintNum(stationclass.getPrintNum());
+            }else{
+                stationClassesSummary.setPrintNum(Long.valueOf("0"));
+            }
+
             stationClassesSummary.setClassesMan(stationclass.getClassStructureMan());
             i=stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary);
         }

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

@@ -126,4 +126,9 @@ public interface PayOrderMapper
      * @return
      */
     public List<PayOrder> selectPersonnelPayStructure(PayOrder payOrder);
+
+    /**
+     * 查询油站第一笔订单的数据
+     */
+    public  PayOrder getPayOrderInfoMin(PayOrder payOrder);
 }

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

@@ -122,4 +122,11 @@ public interface IPayOrderService
      * @return
      */
     public List<PayOrder> selectPersonnelPayStructure(PayOrder payOrder);
+
+    /**
+     * 查询本站第一笔订单
+     * @param payOrder
+     * @return
+     */
+    public PayOrder getPayOrderInfoMin(PayOrder payOrder);
 }

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

@@ -190,4 +190,14 @@ public class PayOrderServiceImpl implements IPayOrderService
         return payOrderMapper.selectPersonnelPayStructure(payOrder);
     }
 
+    /**
+     * 查询本站第一笔订单
+     * @param payOrder
+     * @return
+     */
+    @Override
+    public PayOrder getPayOrderInfoMin(PayOrder payOrder) {
+        return payOrderMapper.getPayOrderInfoMin(payOrder);
+    }
+
 }

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

@@ -301,6 +301,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY a.oil_personnel
     </select>
+<!--查询本站第一笔数据-->
+    <select id="getPayOrderInfoMin" parameterType="Long" resultMap="PayOrderResult">
+        SELECT * from pay_order where order_id = (
+        SELECT min(order_id)
+        from pay_order
+            <where>
+                <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+                <if test="stationId != null "> and station_id = #{stationId}</if>
+                <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+                <if test="status != null  and status != ''"> and status = #{status}</if>
+            </where>
+        )
+    </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/StationClassStructureMapper.xml

@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--根据班次号汇总班结数据-->
     <select id="selectSummyClassStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         SELECT class_structure_no,class_start_date,class_structure_date,station_id,station_name,count(order_no) as num,
-        sum(order_liters) as order_liters,sum(amt) as amt,class_structure_man
+        sum(order_liters) as order_liters,sum(amt) as amt,class_structure_man,sum(print_num) as print_num
         from station_class_structure
         <where>
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>