From 8e097222755a4946a8682445c2edb8f2c7b76bf2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 15:41:02 +0800
Subject: [PATCH] 20200721 代码提交
---
src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java | 5 +++++
src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html | 10 +++++-----
src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml | 4 ++--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
index 84bed69..a8b0b88 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
@@ -185,4 +185,9 @@
*/
@TableField(exist = false)
private int accountType;
+ /**
+ * 查询条件：账号类型
+ */
+ @TableField(exist = false)
+ private String isTest;
}
diff --git a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
index 6ec2e3d..d37eab5 100644
--- a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
+++ b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
@@ -38,8 +38,8 @@
<if test="record.account!=null and record.account!=''">
and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
</if>
- <if test="record.accountType!=null and record.accountType!=''">
- and m.account_type= #{record.accountType}
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
</if>
</if>
</where>
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html
index 9f8870a..56aab93 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html
@@ -15,7 +15,7 @@
<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">账号类型</label>
<div class="layui-input-inline">
- <select name="accountType">
+ <select name="isTest">
<option value=""></option>
<option value="1">正常账号</option>
<option value="2">测试账号</option>
@@ -66,11 +66,11 @@
tableIns.reload({where: params, page: {curr: 1}});
});
- // 刷新按钮
+ // 刷新按钮
$reset.on('click', function () {
- $searchForm[0].reset();
+ $searchForm[0].reset();
sortObject.type = 'null';
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}});
});
function initTable() {
@@ -135,7 +135,7 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
- accountType: $searchForm.find("select[name='accountType']").val(),
+ isTest: $searchForm.find("select[name='isTest']").val(),
};
}
--
Gitblit v1.9.1