From bc7d9c98bc1b23ef6ef29ed4a6313753f6900640 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 02:25:01 +0800
Subject: [PATCH] 费用统计查询修复； 检验下单字段调整； 下单进度查询修改； 执行优化去掉多余模板内容； 报告生成删除试验方法； 修改报告表格列宽； 修改报告删除列的统计方法
---
performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
index e126761..2623b39 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
@@ -1,11 +1,13 @@
package com.yuanchu.mom.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.PerformanceShiftMapDto;
+import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.PerformanceShift;
import org.springframework.data.repository.query.Param;
+import java.util.List;
import java.util.Map;
/**
@@ -16,12 +18,20 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2024-05-08 09:12:04
*/
-public interface PerformanceShiftMapper extends BaseMapper<PerformanceShift> {
+public interface PerformanceShiftMapper extends MyBaseMapper<PerformanceShift> {
- IPage<Map<String, Object>> performanceShiftPage(
+ IPage<PerformanceShiftMapDto> performanceShiftPage(
Page<Object> page,
@Param("time") String time,
@Param("userName") String userName,
@Param("laboratory") String laboratory
);
+
+ List<Map<String, Object>> performanceShiftYearPage(@Param("time") String time,
+ @Param("userName") String userName,
+ @Param("laboratory") String laboratory);
+
+ IPage<Map<String, Object>> performanceShiftYear(Page<Object> page, String time, String userName, String laboratory);
+
+ List<Map<String, Object>> performanceShiftYearList(String time, String userName, String laboratory);
}
--
Gitblit v1.9.3