From d173c4f29f1729480444c3db67f577581055accb Mon Sep 17 00:00:00 2001
From: dorion <872354125@qq.com>
Date: Mon, 15 Jul 2024 21:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E4=B8=9A=E5=8A=A1=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/trx2Energy/tenant/add.html    | 7 +++++++
 .../main/resources/templates/trx2Energy/tenant/edit.html   | 7 +++++++
 .../main/resources/templates/trx2Energy/tenant/tenant.html | 3 +++
 .../com/ruoyi/common/core/domain/entity/TenantInfo.java    | 2 ++
 .../src/main/resources/mapper/account/TenantInfoMapper.xml | 6 +++++-
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html
index c42b4d10e..37f9219ec 100644
--- a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html
+++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html
@@ -68,6 +68,13 @@
             </div>
         </div>
 
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <input name="remark" class="form-control" type="text">
+            </div>
+        </div>
+
     </form>
 </div>
 <th:block th:include="include :: footer" />
diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/edit.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/edit.html
index f4894db41..a2bc6b89e 100644
--- a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/edit.html
@@ -67,6 +67,13 @@
             </div>
         </div>
 
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <input name="remark" th:field="*{remark}" class="form-control" type="text">
+            </div>
+        </div>
+
 <!--        <input name="fcd" th:value="${#dates.format(tenantInfo.fcd, 'yyyy-MM-dd HH:mm:ss')}"  type="hidden">-->
         <input name="period" th:field="*{period}"  type="hidden">
 <!--        <input name="price" th:value="${price}"  type="hidden">-->
diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/tenant.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/tenant.html
index b3af4d0b8..5085d7ae9 100644
--- a/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/tenant.html
+++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/tenant.html
@@ -188,6 +188,9 @@
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(calcRuleDatas, value);
                     }
+                }, {
+                    field: 'remark',
+                    title: '备注'
                 },
                 {
                     field: 'fcd',
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java
index 497208387..932ee7f0e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -14,6 +15,7 @@ import java.util.Date;
  * @date 2024-04-14
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class TenantInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml
index 476021403..b4b473b97 100644
--- a/ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml
@@ -21,6 +21,7 @@
         <result property="delegatedDays"    column="delegated_days"    />
         <result property="totalCountUsed"    column="total_count_used"    />
         <result property="calcRule"    column="calc_rule"    />
+        <result property="remark"    column="remark"    />
         <result property="fcd"    column="fcd"    />
         <result property="fcu"    column="fcu"    />
         <result property="lcd"    column="lcd"    />
@@ -28,7 +29,7 @@
     </resultMap>
 
     <sql id="selectTenantInfoVo">
-        select id_tenant_info, receiver_address, monitor_address, energy_busi_type,price, transfer_count, exchange_unit, tx_id, exchange_amount, is_paid, period, t.user_id, t.status, delegated_days, total_count_used, calc_rule, fcd, fcu, lcd, lcu from tenant_info t
+        select id_tenant_info, receiver_address, monitor_address, energy_busi_type,price, transfer_count, exchange_unit, tx_id, exchange_amount, is_paid, period, t.user_id, t.status, delegated_days, total_count_used, calc_rule, t.remark,fcd, fcu, lcd, lcu from tenant_info t
     </sql>
 
     <select id="selectTenantInfoList" parameterType="TenantInfo" resultMap="TenantInfoResult">
@@ -80,6 +81,7 @@
             <if test="delegatedDays != null">delegated_days,</if>
             <if test="totalCountUsed != null">total_count_used,</if>
             <if test="calcRule != null">calc_rule,</if>
+            <if test="remark != null">remark,</if>
             <if test="fcd != null">fcd,</if>
             <if test="fcu != null">fcu,</if>
             <if test="lcd != null">lcd,</if>
@@ -101,6 +103,7 @@
             <if test="delegatedDays != null">#{delegatedDays},</if>
             <if test="totalCountUsed != null">#{totalCountUsed},</if>
             <if test="calcRule != null">#{calcRule},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="fcd != null">#{fcd},</if>
             <if test="fcu != null">#{fcu},</if>
             <if test="lcd != null">#{lcd},</if>
@@ -126,6 +129,7 @@
             <if test="delegatedDays != null">delegated_days = #{delegatedDays},</if>
             <if test="totalCountUsed != null">total_count_used = #{totalCountUsed},</if>
             <if test="calcRule != null">calc_rule = #{calcRule},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="fcd != null">fcd = #{fcd},</if>
             <if test="fcu != null">fcu = #{fcu},</if>
             <if test="lcd != null">lcd = #{lcd},</if>