update 更改APP运单看板统计

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppWayBillController.java

@@ -30,9 +30,11 @@ public class AppWayBillController {
      */
     @Valid
     @RequestMapping(name = "APP运单统计分类", value = "/waybillStatistic", method = RequestMethod.GET)
-    public HttpResult waybillStatistic(@RequestParam("keyword") String keyword) {
+    public HttpResult waybillStatistic(@RequestParam("keyword") String keyword,
+                                       @RequestParam("startDate") String startDate,
+                                       @RequestParam("endDate") String endDate) {
         try {
-            return waybillManagementService.waybillDataStatisticApp(keyword);
+            return waybillManagementService.waybillDataStatisticApp(keyword, startDate, endDate);
         } catch (Exception e) {
             log.error("APP运单统计分类:订单id {},error {} ", keyword, e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -130,7 +130,12 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
      * @param statuses 查询状态
      * @return
      */
-    Long selectWaybillOrderCountByStatus(@Param("entId") Long entId, @Param("statuses") List<Long> statuses, @Param("keyword") String keyword);
+    Long selectWaybillOrderCountByStatus(
+            @Param("entId") Long entId,
+            @Param("statuses") List<Long> statuses,
+            @Param("keyword") String keyword,
+            @Param("startDate") String startDate,
+            @Param("endDate") String endDate);
 
     Map<String,Object> selectOrderByOrderId(@Param("orderId") Long orderId, @Param("type") Integer type, @Param("statusList") List<Long> statusList);
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillListAppDTO.java

@@ -46,13 +46,13 @@ public class WaybillListAppDTO {
      * 查询开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date startDate;
+    private String startDate;
 
     /**
      * 查询结束时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date endDate;
+    private String endDate;
 
     /**
      * 物流订单单号

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -816,15 +816,21 @@ public class WaybillManagementService {
      * @param keyword
      * @return
      */
-    public HttpResult waybillDataStatisticApp(String keyword) {
+    public HttpResult waybillDataStatisticApp(String keyword, String startDate, String endDate) {
         Long entId = LoginUserHolder.getEntId();
+        if(StringUtils.isNotBlank(startDate)) {
+            startDate = startDate.concat(" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(endDate)) {
+            endDate = endDate.concat(" 00:00:00");
+        }
         // 运输途中
         Map<String, String> _onway = new HashMap<>();
         _onway.put("name", "运输中");
         _onway.put("value", "onway");
         _onway.put("total", "0");
         List<Long> onWayStates = getWallBillStatues("onway");
-        Long onWayCount = kwtWaybillOrderMapper.selectWaybillOrderCountByStatus(entId, onWayStates, keyword);
+        Long onWayCount = kwtWaybillOrderMapper.selectWaybillOrderCountByStatus(entId, onWayStates, keyword, null, null);
         _onway.put("total", onWayCount.toString());
         // 已完成
         Map<String, String> _finish = new HashMap<>();
@@ -832,7 +838,7 @@ public class WaybillManagementService {
         _finish.put("value", "finish");
         _finish.put("total", "0");
         List<Long> finishStates = getWallBillStatues("finish");
-        Long finishCount = kwtWaybillOrderMapper.selectWaybillOrderCountByStatus(entId, finishStates, keyword);
+        Long finishCount = kwtWaybillOrderMapper.selectWaybillOrderCountByStatus(entId, finishStates, keyword, startDate, endDate);
         _finish.put("total", finishCount.toString());
         List<Map<String, String>> _list = new ArrayList<>();
         _list.add(_onway);
@@ -952,8 +958,8 @@ public class WaybillManagementService {
                 LoginUserHolder.getEntId(),
                 _statuses,
                 query.getKeyword(),
-                query.getStartDate() == null ? null : query.getStartDate().toString().concat(" 00:00:00"),
-                query.getEndDate() == null ? null : query.getEndDate().toString().concat(" 23:59:59")
+                StringUtils.isBlank(query.getStartDate()) ? null : query.getStartDate().concat(" 00:00:00"),
+                StringUtils.isBlank(query.getEndDate()) ? null : query.getEndDate().concat(" 23:59:59")
         );
         return HttpResult.ok(amount);
     }