From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 14:04:24 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentReportRepairMapper.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentReportRepairMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentReportRepairMapper.java index 347649c..9ed8493 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentReportRepairMapper.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentReportRepairMapper.java @@ -5,7 +5,10 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.eam.entity.ChangeCause; import org.jeecg.modules.eam.entity.EquipmentReportRepair; +import org.jeecg.modules.eam.vo.RepairReportExportVo; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -16,5 +19,22 @@ */ public interface EquipmentReportRepairMapper extends BaseMapper<EquipmentReportRepair> { - IPage<Map<String, Object>> getReportRepairList(IPage<Map> pageData, @Param("params") Map<String,Object> params); + IPage<Map<String, Object>> getReportRepairList(IPage<Map> pageData, @Param("params") Map<String,Object> params,@Param("equipNums") List<String> equipNums); + + List<RepairReportExportVo> exportList( + @Param("num")String num, + @Param("faultStartTime")Date faultStartTime, + @Param("faultEndTime")Date faultEndTime, + @Param("isStop")String isStop, + @Param("status")String status, + @Param("errUda2")String errUda2, + @Param("errUda1")String errUda1, + @Param("createBy")String createBy, + @Param("equipmentNum")String equipmentNum, + @Param("equipmentName")String equipmentName, + @Param("equipmentModel")String equipmentModel, + @Param("specification")String specification, + @Param("useId")String useId, + @Param("equipNums")List<String> equipNums + ); } -- Gitblit v1.9.3