POS机添加班结开始时间和结束时间

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -20,10 +20,7 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <Title> PosMachineController </Title>
@@ -138,8 +135,12 @@ public class PosMachineController {
                 //班结过
                 beginTime= dateFormat.format(sss.getClassStructureDate());
             }else {
+                PayOrder payOrder = new PayOrder();
+                payOrder.setStatus("1");
+                payOrder.setStationId(stationId);
+                PayOrder payOrderInfoMin = payOrderService.getPayOrderInfoMin(payOrder);
                 //没有班结过：第一次班结
-                beginTime =null;
+                beginTime =dateFormat.format(payOrderInfoMin.getPayDate());
             }
             //获取上次班结时间
             PayOrder order=new PayOrder();
@@ -150,6 +151,14 @@ public class PosMachineController {
             //查询要班结订单总和
             order.setGroupBy("");
             List<Map> listSum = payOrderService.selectSum(order);
+
+            //班结时间
+            List<Map> timeList = new ArrayList<>();
+            Map<String, String> m = new HashMap<>();
+            m.put("beginTime", beginTime);
+            m.put("endTime", dateFormat.format(date));
+            timeList.add(m);
+
             //查询要班结订单总和按油品分类
             order.setGroupBy("oilName");
             List<Map> listSumGroupByOilName = payOrderService.selectSum(order);
@@ -159,6 +168,7 @@ public class PosMachineController {
             Map<String, Object> map = new HashMap();
             map.put("listSumGroupByOilName", listSumGroupByOilName);
             map.put("listSum", listSum);
+            map.put("timeList", timeList);
             map.put("listSumGroupByPayType", listSumGroupByPayType);
             resultData =ResultData.success(map);
         }else {

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -156,7 +156,7 @@
           <if test="status !=null">
               AND T2.status= #{status}
           </if>
-          <if test="beginTime !=null">
+          <if test="beginTime !=null and beginTime !=''">
               AND T2.pay_date &gt;= #{beginTime}
           </if>
           <if test="endTime !=null">
@@ -244,6 +244,7 @@
         AND status= #{status}
       </if>
     </where>
+      ORDER BY  pay_date ASC LIMIT 0,1
   </select>