From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
index 59510a7..ed210d2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
@@ -3,15 +3,17 @@
import annotation.AutoFill;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.dto.CheckScoreDTO;
+import com.ycl.platform.domain.dto.ScoreIndexDTO;
import com.ycl.platform.domain.entity.CheckScore;
import enumeration.OperationType;
+import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 鑰冩牳绉垎鏄庣粏Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-22
*/
@@ -19,7 +21,7 @@
{
/**
* 鏌ヨ鑰冩牳绉垎鏄庣粏
- *
+ *
* @param id 鑰冩牳绉垎鏄庣粏涓婚敭
* @return 鑰冩牳绉垎鏄庣粏
*/
@@ -27,7 +29,7 @@
/**
* 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
- *
+ *
* @param checkScore 鑰冩牳绉垎鏄庣粏
* @return 鑰冩牳绉垎鏄庣粏闆嗗悎
*/
@@ -35,7 +37,7 @@
/**
* 鏂板鑰冩牳绉垎鏄庣粏
- *
+ *
* @param checkScore 鑰冩牳绉垎鏄庣粏
* @return 缁撴灉
*/
@@ -43,7 +45,7 @@
/**
* 淇敼鑰冩牳绉垎鏄庣粏
- *
+ *
* @param checkScore 鑰冩牳绉垎鏄庣粏
* @return 缁撴灉
*/
@@ -51,7 +53,7 @@
/**
* 鍒犻櫎鑰冩牳绉垎鏄庣粏
- *
+ *
* @param id 鑰冩牳绉垎鏄庣粏涓婚敭
* @return 缁撴灉
*/
@@ -59,7 +61,7 @@
/**
* 鎵归噺鍒犻櫎鑰冩牳绉垎鏄庣粏
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -68,5 +70,26 @@
@AutoFill(OperationType.UPDATE)
int publishCheckScore(CheckScoreDTO checkScoreDTO);
- List<Map> selectScoreIndex(String tableName,Long deptId,String date);
+ List<Map> selectScoreIndex(ScoreIndexDTO scoreIndexDTO);
+
+ void saveBatch(List<CheckScore> scoreList);
+
+ List<CheckScore> selectCheckScoreMap(CheckScore checkScore);
+
+ /**
+ * 棣栭〉鑰冩牳棰勮
+ * @return 鏁版嵁
+ */
+ List<Map<String, Object>> home();
+
+ /**
+ * 棣栭〉鏍哥畻
+ * @param startDate 鏈湀绗竴澶�
+ * @param endDate 褰撳墠鏃堕棿
+ * @param category 鍒嗙被
+ * @return 鏁版嵁
+ */
+ List<Map<String, Object>> calculate(Date startDate, Date endDate, String category);
+
+ CheckScore getLast(CheckScore checkScore);
}
--
Gitblit v1.8.0