From ec1f20c31d64ddbc5242c3942902bc5233a8a140 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 18 四月 2025 10:40:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb --- inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java index 3f6176e..99c120f 100644 --- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsReportMapper.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.inspect.dto.InsReportExport; import com.ruoyi.inspect.dto.ReportPageDto; import com.ruoyi.inspect.pojo.InsReport; import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author Administrator @@ -31,6 +34,14 @@ String getLaboratoryByName(@Param("name") String name, @Param("type") String type); + /** + * 鎶ュ憡鎶ヨ〃瀵煎嚭 + * @return + */ + List<InsReportExport> reportAllExport(@Param("ew") QueryWrapper<ReportPageDto> ew, + @Param("userId") Integer userId, + @Param("queryStatus") String queryStatus, + @Param("createOrderUser") Integer createOrderUser); } -- Gitblit v1.9.3