From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index 6522037..054022d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -1,10 +1,13 @@
package com.mes.damage.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;
+import com.mes.utils.Result;
import java.util.List;
@@ -18,7 +21,15 @@
*/
public interface DamageService extends MPJBaseService<Damage> {
- List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
+ Page<Damage> selectDamage(
+ String startTime,
+ String endTime,
+ int type,
+ int status,
+ String workingProcedure,
+ int pageNum, // 鏂板锛氬姩鎬侀〉鐮�
+ int pageSize // 鏂板锛氬姩鎬佹瘡椤垫潯鏁�
+ );
// List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
--
Gitblit v1.8.0