From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 04 九月 2024 17:16:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java index 9ab9d15..f95bd46 100644 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java @@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.platform.base.BaseSelect; +import com.ycl.platform.domain.entity.ReportAuditingRecord; import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.query.YwPointQuery; +import com.ycl.platform.domain.vo.ReportAuditingRecordVO; import com.ycl.platform.domain.vo.YwPointVO; import com.ycl.platform.domain.excel.PointExport; import org.apache.ibatis.annotations.Mapper; @@ -85,4 +87,21 @@ * @return */ List<String> getDeptPointGB(@Param("tagType") Integer tagType); + + /** + * 鐐逛綅涓嬫媺 + * + * @param keyword + * @param unitId + * @return + */ + List<YwPoint> select(@Param("keyword") String keyword, @Param("unitId") Integer unitId); + + /** + * 鑾峰彇鏈�鏂颁竴鏉℃姤澶囩粨鏋� + * @param serialNumber + * @param reportType + * @return + */ + ReportAuditingRecordVO getReportResult(@Param("serialNumber") String serialNumber, @Param("reportType") String reportType); } -- Gitblit v1.8.0