From 6990ae425b0149945ba8e4e890197cca7894d903 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Thu, 12 Mar 2026 22:44:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B9=E7=9B=AE=E5=88=9D?=
=?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/screen/Erp/components/ChartV10.vue | 6 ++--
.../views/screen/Erp/components/ChartV11.vue | 6 ++--
.../mini/mybigscreen/biz/domain/ItemInfo.java | 34 +++++++++++++++----
.../biz/mapper/ItemInfoMapper.java | 6 ++--
.../com/mini/mybigscreen/mybatis/demo.java | 2 +-
5 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/screen-vue/src/views/screen/Erp/components/ChartV10.vue b/screen-vue/src/views/screen/Erp/components/ChartV10.vue
index 3c4ffa0..f037a2c 100644
--- a/screen-vue/src/views/screen/Erp/components/ChartV10.vue
+++ b/screen-vue/src/views/screen/Erp/components/ChartV10.vue
@@ -20,8 +20,9 @@
:header-row-style="{ background: 'transparent' }"
:header-cell-style="{ borderBottom: '1px solid rgba(26, 80, 139, 0.3)' }"
>
-
+
+
@@ -46,8 +47,9 @@
:header-row-style="{ background: 'transparent' }"
:header-cell-style="{ borderBottom: '1px solid rgba(26, 80, 139, 0.3)' }"
>
-
+
+
diff --git a/screen-vue/src/views/screen/Erp/components/ChartV11.vue b/screen-vue/src/views/screen/Erp/components/ChartV11.vue
index 0b784c8..f01d688 100644
--- a/screen-vue/src/views/screen/Erp/components/ChartV11.vue
+++ b/screen-vue/src/views/screen/Erp/components/ChartV11.vue
@@ -20,8 +20,9 @@
:header-row-style="{ background: 'transparent' }"
:header-cell-style="{ borderBottom: '1px solid rgba(26, 80, 139, 0.3)' }"
>
-
+
+
@@ -46,8 +47,9 @@
:header-row-style="{ background: 'transparent' }"
:header-cell-style="{ borderBottom: '1px solid rgba(26, 80, 139, 0.3)' }"
>
-
+
+
diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/ItemInfo.java b/src/main/java/com/mini/mybigscreen/biz/domain/ItemInfo.java
index be86b95..aed262b 100644
--- a/src/main/java/com/mini/mybigscreen/biz/domain/ItemInfo.java
+++ b/src/main/java/com/mini/mybigscreen/biz/domain/ItemInfo.java
@@ -4,12 +4,9 @@ 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 java.io.Serial;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
-
-import com.mini.mybigscreen.Model.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -19,14 +16,13 @@ import lombok.Setter;
*
*
* @author gaoxq
- * @since 2026-02-24
+ * @since 2026-03-12
*/
@Getter
@Setter
@TableName("biz_item_info")
-public class ItemInfo extends BaseEntity implements Serializable {
+public class ItemInfo implements Serializable {
- @Serial
private static final long serialVersionUID = 1L;
/**
@@ -190,4 +186,28 @@ public class ItemInfo extends BaseEntity implements Serializable {
*/
@TableField("is_deleted")
private String isDeleted;
+
+ /**
+ * 指标求和
+ */
+ @TableField("index_sum")
+ private BigDecimal indexSum;
+
+ /**
+ * 指标平均
+ */
+ @TableField("index_avg")
+ private BigDecimal indexAvg;
+
+ /**
+ * 指标最大
+ */
+ @TableField("index_max")
+ private BigDecimal indexMax;
+
+ /**
+ * 指标最小
+ */
+ @TableField("index_min")
+ private BigDecimal indexMin;
}
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java
index 08fcccc..87d9595 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java
@@ -1,7 +1,7 @@
package com.mini.mybigscreen.biz.mapper;
-import com.github.yulichang.base.MPJBaseMapper;
import com.mini.mybigscreen.biz.domain.ItemInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
@@ -9,8 +9,8 @@ import com.mini.mybigscreen.biz.domain.ItemInfo;
*
*
* @author gaoxq
- * @since 2026-02-24
+ * @since 2026-03-12
*/
-public interface ItemInfoMapper extends MPJBaseMapper {
+public interface ItemInfoMapper extends BaseMapper {
}
diff --git a/src/main/java/com/mini/mybigscreen/mybatis/demo.java b/src/main/java/com/mini/mybigscreen/mybatis/demo.java
index a2f1607..1652bc4 100644
--- a/src/main/java/com/mini/mybigscreen/mybatis/demo.java
+++ b/src/main/java/com/mini/mybigscreen/mybatis/demo.java
@@ -29,7 +29,7 @@ public class demo {
.pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper"));
})
.strategyConfig(builder -> {
- builder.addInclude("biz_chart_info")
+ builder.addInclude("biz_item_info")
.addTablePrefix("biz_")
.entityBuilder()
.enableLombok()