From 5fc5876a94dcbd5e9a9fb91f5e3c01211e9c2d96 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 24 一月 2024 16:59:19 +0800
Subject: [PATCH] 返修标记
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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..83b3669 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,14 +1,14 @@
package com.jcdm.main.bs.orderScheduling.service.impl;
-import java.util.List;
-
-import cn.hutool.core.util.StrUtil;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.main.bs.orderScheduling.Query.PrepareOnlineQuery;
+import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
+import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
+import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
-import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
-import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
+
+import java.util.List;
/**
* 璁㈠崟鎺掍骇Service涓氬姟灞傚鐞�
@@ -17,7 +17,7 @@
* @date 2024-01-13
*/
@Service
-public class BsOrderSchedulingServiceImpl implements IBsOrderSchedulingService
+public class BsOrderSchedulingServiceImpl implements IBsOrderSchedulingService
{
@Autowired
private BsOrderSchedulingMapper bsOrderSchedulingMapper;
@@ -43,14 +43,23 @@
@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);
}
+
+ /**
+ * 鏌ヨ鍚堢涓婄嚎鍒楄〃
+ * @param prepareOnlineQuery
+ * @return list
+ */
+ public List<BsOrderScheduling> getPrepareOnlineList(PrepareOnlineQuery prepareOnlineQuery){
+ return bsOrderSchedulingMapper.getPrepareOnlineList(prepareOnlineQuery);
+ }
/**
* 鏂板璁㈠崟鎺掍骇
*
--
Gitblit v1.9.3