github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

定制业务备注功能

pull/520/head
dorion 2024-07-15 21:19:02 +08:00
parent 0d9da75a26
commit d173c4f29f
5 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/add.html
View File

@ -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" />

7
ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/edit.html
View File

@ -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">-->

3
ruoyi-admin/src/main/resources/templates/trx2Energy/tenant/tenant.html
View File

@ -188,6 +188,9 @@
formatter: function(value, row, index) {
return $.table.selectDictLabel(calcRuleDatas, value);
}
}, {
field: 'remark',
title: '备注'
},
{
field: 'fcd',

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TenantInfo.java
View File

@ -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;

6
ruoyi-system/src/main/resources/mapper/account/TenantInfoMapper.xml
View File

@ -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>