From 7fe70153b2caa46dd0b2b2fec8b7da824dff1697 Mon Sep 17 00:00:00 2001 From: cuikaidong <ckd2942379034@163.com> Date: 星期一, 21 四月 2025 10:18:56 +0800 Subject: [PATCH] 设备故障原因维护扩展字段 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java | 8 +++++++- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java index c4ebc41..dabe79a 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFaultReason.java @@ -1,6 +1,7 @@ package org.jeecg.modules.eam.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -63,4 +64,9 @@ @ApiModelProperty(value = "鏁呴殰鍒嗙被") @Dict(dicCode = "fault_reason_category") private String faultCategory; + + @TableField(exist = false) + private String text; + @TableField(exist = false) + private String value; } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java index 6680dbb..6b23d3d 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java @@ -22,8 +22,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 璁惧鏁呴殰鍘熷洜缁存姢 * @Author: jeecg-boot * @Date: 2025-03-19 @@ -58,6 +59,11 @@ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0); Page<EamEquipmentFaultReason> page = new Page<EamEquipmentFaultReason>(pageNo, pageSize); IPage<EamEquipmentFaultReason> pageList = eamEquipmentFaultReasonService.page(page, queryWrapper); + List<EamEquipmentFaultReason> records = pageList.getRecords(); + records.forEach(r ->{ + r.setText(r.getFaultName()); + r.setValue(r.getId()); + }); return Result.OK(pageList); } -- Gitblit v1.9.3