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/impl/DamageServiceImpl.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 8cf818c..2c4ad7d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -3,6 +3,8 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
@@ -13,6 +15,7 @@
import com.mes.damage.service.DamageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.pp.entity.DamageDetails;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;
@@ -61,25 +64,37 @@
/**
* 鏌ヨ鎶ュ伐淇℃伅
*/
- @Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
- LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
- damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
- if (type != 0) {
- damageSelectWrapper.eq(Damage::getType, type);
- }
- if (status != 0) {
- damageSelectWrapper.eq(Damage::getStatus, status);
- }
- if (!"0".equals(workingProcedure)) {
- damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
- }
- List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
-// for (Damage damage : damageList) {
-// damage.setStatus(2);
-// }
- return damageList;
+ /**
+ * 鍒嗛〉鏌ヨ鎹熷潖璁板綍
+ * @param startTime 寮�濮嬫椂闂达紙鏍煎紡锛歽yyy-MM-dd HH:mm:ss锛�
+ * @param endTime 缁撴潫鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
+ * @param type 鎹熷潖绫诲瀷锛�0琛ㄧず鏌ヨ鎵�鏈夌被鍨嬶級
+ * @param status 鐘舵�侊紙0琛ㄧず鏌ヨ鎵�鏈夌姸鎬侊級
+ * @param workingProcedure 宸ュ簭锛�"0"琛ㄧず鏌ヨ鎵�鏈夊伐搴忥級
+ * @param pageNum 椤电爜锛堜粠1寮�濮嬶級
+ * @param pageSize 姣忛〉鏉℃暟
+ * @return 鍒嗛〉鍚庣殑鎹熷潖璁板綍鍒楄〃
+ */
+ @Override
+ public Page<Damage> selectDamage(
+ String startTime,
+ String endTime,
+ int type,
+ int status,
+ String workingProcedure,
+ int pageNum, // 鏂板锛氬姩鎬侀〉鐮�
+ int pageSize // 鏂板锛氬姩鎬佹瘡椤垫潯鏁�
+ ) {
+ Page<Damage> page = new Page<>(pageNum, pageSize);
+
+ LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
+ damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime)
+ .eq(type != 0, Damage::getType, type)
+ .eq(status != 0, Damage::getStatus, status)
+ .eq(!"0".equals(workingProcedure), Damage::getWorkingProcedure, workingProcedure);
+
+ return this.page(page, damageSelectWrapper);
}
/**
--
Gitblit v1.8.0