From a36d141236c0e06af4da16e8247d30915b197e32 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 24 一月 2024 13:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index 550b86d..3b5fbe4 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -1,13 +1,23 @@
package com.jcdm.main.da.passingStationCollection.service.impl;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
+
+import com.jcdm.common.constant.Constants;
import com.jcdm.common.utils.DateUtils;
+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 com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.rm.repairRecord.domain.RmRepairRecord;
import com.jcdm.main.rm.repairRecord.mapper.RmRepairRecordMapper;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;
/**
@@ -24,6 +34,12 @@
@Autowired
private RmRepairRecordMapper rmRepairRecordMapper;
+
+ @Autowired
+ private BsOrderSchedulingMapper bsOrderSchedulingMapper;
+
+ @Autowired
+ private IBsOrderSchedulingService bsOrderSchedulingService;
/**
* 鏌ヨ浜у搧杩囩珯閲囬泦
@@ -50,6 +66,26 @@
}
/**
+ * 鑾峰彇棣栭〉鍗曟棩绱閲忎骇鏁版嵁
+ * @param fieldName bs
+ * @return list
+ */
+ @Override
+ public Integer getProduceNumToday(String fieldName) {
+
+ BsOrderScheduling bsOrderScheduling = new BsOrderScheduling();
+ bsOrderScheduling.setQueryField(fieldName);
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime startTime = LocalDate.now().atStartOfDay();
+ LocalDateTime endTime = LocalDate.now().plusDays(1).atStartOfDay();
+ String s1 = startTime.format(formatter);
+ String s2 = endTime.format(formatter);
+ bsOrderScheduling.setStartTime(s1);
+ bsOrderScheduling.setEndTime(s2);
+ return bsOrderSchedulingMapper.getProduceNumToday(bsOrderScheduling);
+ }
+
+ /**
* 鏂板浜у搧杩囩珯閲囬泦
*
* @param daPassingStationCollection 浜у搧杩囩珯閲囬泦
--
Gitblit v1.9.3