From 48fee945c1ac20a957d5f5838669a44e94181d3f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 25 三月 2024 16:43:16 +0800
Subject: [PATCH] 修改查询控制器 增加显示在线状态字段 具体数据待对接
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 11 +++--------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 5 +++--
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index 25c88b2..3b870e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -51,13 +51,8 @@
@ColumnWidth(30)
private Date findDt;
- /**
- * 鍦ㄧ嚎鐘舵��;1-鍦ㄧ嚎锛�2-绂荤嚎
- */
- @Schema(description = "鍦ㄧ嚎鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(title = "鍦ㄧ嚎鐘舵��")
@ExcelProperty("鍦ㄧ嚎鐘舵��")
- @ColumnWidth(1)
- @Max(message = "鍦ㄧ嚎鐘舵�佸彧鑳�1鎴�2", value = 2)
- @Min(message = "鍦ㄧ嚎鐘舵�佸彧鑳�1鎴�2",value = 1)
- private byte onlineState;
+ @ColumnWidth(6)
+ private String onlineState;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index 8520b12..d9edbe5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -30,7 +30,7 @@
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
- select
+ select
<include refid="Base_Column_List" />
from pr_controller
where id = #{id,jdbcType=BIGINT}
@@ -194,8 +194,9 @@
CAST(con.id AS char) AS id,
con.rtuAddr AS rtuAddr,
inta.name AS intakeName,
+ "鍦ㄧ嚎" AS onlineState,
(SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
- con.findDt
+ con.findDt AS findDt
FROM pr_controller con
INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON con.intakeId = inta.id
--
Gitblit v1.8.0