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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 60bbb70..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
@@ -3,6 +3,7 @@
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;
@@ -43,11 +44,11 @@
@Override
public List<BsOrderScheduling> selectBsOrderSchedulingList(BsOrderScheduling bsOrderScheduling)
{
-
-// if(StrUtil.isNotBlank(bsOrderScheduling.getOperateTime())){
-//// String[] dateArray = gson.fromJson(jsonString, String[].class);
-//
-// }
+ if(bsOrderScheduling.getDateConditions()!=null){
+ String[] conditions = bsOrderScheduling.getDateConditions();
+ bsOrderScheduling.setStartTime(conditions[0]);
+ bsOrderScheduling.setEndTime(conditions[1]);
+ }
return bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
}
--
Gitblit v1.9.3