From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
index eed0d0d..1b00910 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
@@ -1,12 +1,12 @@
package com.ruoyi.inspect.service.impl;
+import java.util.HashMap;
import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper;
import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
import com.ruoyi.inspect.service.IArdVideoInspectRecordService;
+import javax.annotation.Resource;
/**
* 瑙嗛宸℃璁板綍Service涓氬姟灞傚鐞�
@@ -16,7 +16,7 @@
*/
@Service
public class ArdVideoInspectRecordServiceImpl implements IArdVideoInspectRecordService {
- @Autowired
+ @Resource
private ArdVideoInspectRecordMapper ardVideoInspectRecordMapper;
/**
@@ -41,6 +41,20 @@
return ardVideoInspectRecordMapper.selectArdVideoInspectRecordList(ardVideoInspectRecord);
}
+ @Override
+ public List<HashMap> selectArdVideoInspectRecordListByStartTime(ArdVideoInspectRecord ardVideoInspectRecord) {
+ return ardVideoInspectRecordMapper.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
+ }
+
+ /**
+ * 鎸夋湀浠借幏鍙栨瘡鏃ヨ褰曟枃浠舵暟閲�
+ * @param startMonth
+ * @return
+ */
+ public List<ArdVideoInspectRecord> selectArdVideoInspectRecordCountByStartMonth(String startMonth) {
+ return ardVideoInspectRecordMapper.selectArdVideoInspectRecordCountByStartMonth(startMonth);
+ }
+
/**
* 鏂板瑙嗛宸℃璁板綍
*
@@ -49,7 +63,7 @@
*/
@Override
public int insertArdVideoInspectRecord(ArdVideoInspectRecord ardVideoInspectRecord) {
- ardVideoInspectRecord.setUserId(SecurityUtils.getUserId());
+ // ardVideoInspectRecord.setUserId(SecurityUtils.getUserId());
return ardVideoInspectRecordMapper.insertArdVideoInspectRecord(ardVideoInspectRecord);
}
--
Gitblit v1.9.3