From 1bc1ad0105a26b8ae7e8f5af636181707312d6cc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 28 五月 2025 12:56:18 +0800
Subject: [PATCH] art: 设备管理-故障报修-查询接口优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml | 7 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java | 10 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 58 ++++++++++++++++++++++++++--
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java | 8 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java | 3 +
5 files changed, 80 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
index 714cf42..f0e3429 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
@@ -37,7 +37,7 @@
*/
@Excel(name = "璁惧ID", width = 15, dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
@ApiModelProperty(value = "璁惧ID")
- @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
+// @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
private String equipmentId;
/**
* 璁惧鍚嶇О
@@ -112,4 +112,10 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String installationPosition;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java
index f878ee7..d2f5551 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.eam.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamReportRepair;
@@ -58,4 +60,12 @@
* @return
*/
List<FaultTypeStatisticsVO> faultTypeStatistics(String start, String end);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<EamReportRepair> queryPageList(Page<EamReportRepair> page, @Param(Constants.WRAPPER) QueryWrapper<EamReportRepair> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
index e872ef1..59506ad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
@@ -105,4 +105,11 @@
and t.create_time < #{end}
group by t.fault_type
</select>
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamReportRepair">
+ select wmo.*, e.equipment_code, e.equipment_name, e.installation_position
+ from eam_report_repair wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
index 57396eb..8bbc279 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
@@ -38,4 +38,7 @@
* 鎸囨淳浜猴紙缁翠慨璐熻矗浜猴級
*/
private String repairer;
+
+ private String column;
+ private String order;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index 17d614b..2014997 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -10,7 +10,9 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.*;
@@ -52,22 +54,68 @@
* 鍒嗛〉鍒楄〃
*
* @param page
- * @param eamReportRepairQuery
+ * @param query
* @return
*/
@Override
- public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery) {
+ public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery query) {
+ QueryWrapper<EamReportRepair> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
return page;
}
- List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
}
- return this.baseMapper.pageList(page, eamReportRepairQuery, sysUser.getId(), equipmentIds);
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentCode())) {
+ queryWrapper.like("e.equipment_code", query.getEquipmentCode());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentName())) {
+ queryWrapper.like("e.equipment_name", query.getEquipmentName());
+ }
+ if (StringUtils.isNotBlank(query.getBreakdownFlag())) {
+ queryWrapper.eq("wmo.breakdown_flag", query.getBreakdownFlag());
+ }
+ if (StringUtils.isNotBlank(query.getReportStatus())) {
+ queryWrapper.eq("wmo.report_status", query.getReportStatus());
+ }
+ if (StringUtils.isNotBlank(query.getFaultDescription())) {
+ queryWrapper.like("wmo.fault_description", query.getFaultDescription());
+ }
+ if(query.getStartTime() != null && query.getEndTime() != null) {
+ queryWrapper.between("wmo.fault_start_time", query.getStartTime(), query.getEndTime());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return baseMapper.queryPageList(page, queryWrapper);
}
@Override
--
Gitblit v1.9.3