From ba2d06afaf5bb9992d810d3c5fea38886e89a8f0 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 18 一月 2024 10:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index 9b7dd5c..53aa72b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -1,6 +1,10 @@
 package com.jcdm.main.bs.orderScheduling.service.impl;
 
 import java.util.List;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jcdm.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
@@ -11,7 +15,7 @@
  * 璁㈠崟鎺掍骇Service涓氬姟灞傚鐞�
  * 
  * @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
  */
 @Service
 public class BsOrderSchedulingServiceImpl implements IBsOrderSchedulingService 
@@ -22,13 +26,13 @@
     /**
      * 鏌ヨ璁㈠崟鎺掍骇
      * 
-     * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+     * @param id 璁㈠崟鎺掍骇涓婚敭
      * @return 璁㈠崟鎺掍骇
      */
     @Override
-    public BsOrderScheduling selectBsOrderSchedulingByOrderNumber(String orderNumber)
+    public BsOrderScheduling selectBsOrderSchedulingById(Long id)
     {
-        return bsOrderSchedulingMapper.selectBsOrderSchedulingByOrderNumber(orderNumber);
+        return bsOrderSchedulingMapper.selectBsOrderSchedulingById(id);
     }
 
     /**
@@ -40,6 +44,11 @@
     @Override
     public List<BsOrderScheduling> selectBsOrderSchedulingList(BsOrderScheduling bsOrderScheduling)
     {
+        if(bsOrderScheduling.getDateConditions()!=null){
+            String[] conditions = bsOrderScheduling.getDateConditions();
+            bsOrderScheduling.setStartTime(conditions[0]);
+            bsOrderScheduling.setEndTime(conditions[1]);
+        }
         return bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
     }
 
@@ -52,6 +61,7 @@
     @Override
     public int insertBsOrderScheduling(BsOrderScheduling bsOrderScheduling)
     {
+        bsOrderScheduling.setCreateTime(DateUtils.getNowDate());
         return bsOrderSchedulingMapper.insertBsOrderScheduling(bsOrderScheduling);
     }
 
@@ -64,30 +74,31 @@
     @Override
     public int updateBsOrderScheduling(BsOrderScheduling bsOrderScheduling)
     {
+        bsOrderScheduling.setUpdateTime(DateUtils.getNowDate());
         return bsOrderSchedulingMapper.updateBsOrderScheduling(bsOrderScheduling);
     }
 
     /**
      * 鎵归噺鍒犻櫎璁㈠崟鎺掍骇
      * 
-     * @param orderNumbers 闇�瑕佸垹闄ょ殑璁㈠崟鎺掍骇涓婚敭
+     * @param ids 闇�瑕佸垹闄ょ殑璁㈠崟鎺掍骇涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteBsOrderSchedulingByOrderNumbers(String[] orderNumbers)
+    public int deleteBsOrderSchedulingByIds(Long[] ids)
     {
-        return bsOrderSchedulingMapper.deleteBsOrderSchedulingByOrderNumbers(orderNumbers);
+        return bsOrderSchedulingMapper.deleteBsOrderSchedulingByIds(ids);
     }
 
     /**
      * 鍒犻櫎璁㈠崟鎺掍骇淇℃伅
      * 
-     * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+     * @param id 璁㈠崟鎺掍骇涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteBsOrderSchedulingByOrderNumber(String orderNumber)
+    public int deleteBsOrderSchedulingById(Long id)
     {
-        return bsOrderSchedulingMapper.deleteBsOrderSchedulingByOrderNumber(orderNumber);
+        return bsOrderSchedulingMapper.deleteBsOrderSchedulingById(id);
     }
 }

--
Gitblit v1.9.3