Merge remote-tracking branch 'origin/activity' into activity_xlh
This commit is contained in:
xu0625
commit
d649cfe595
|
|
@ -33,7 +33,7 @@ public class DrawRecord extends BaseEntity
|
||||||
private String USERID;
|
private String USERID;
|
||||||
|
|
||||||
/** 抽奖时间 */
|
/** 抽奖时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "抽奖时间", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "抽奖时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
private Date DRAWTIME;
|
private Date DRAWTIME;
|
||||||
|
|
||||||
|
|
@ -50,17 +50,17 @@ public class DrawRecord extends BaseEntity
|
||||||
private String PRIZETYPE;
|
private String PRIZETYPE;
|
||||||
|
|
||||||
/** 账务日期 */
|
/** 账务日期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "账务日期", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "账务日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
private Date CHECKINGDATE;
|
private Date CHECKINGDATE;
|
||||||
|
|
||||||
/** 创建时间 */
|
/** 创建时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
private Date CREATETIMESTAMP;
|
private Date CREATETIMESTAMP;
|
||||||
|
|
||||||
/** 最后修改时间 */
|
/** 最后修改时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "最后修改时间", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "最后修改时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
private Date LASTUPDATETIMESTAMP;
|
private Date LASTUPDATETIMESTAMP;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
<!-- </li>-->
|
<!-- </li>-->
|
||||||
<li>
|
<li>
|
||||||
<label>发奖结果：</label>
|
<label>发奖结果：</label>
|
||||||
<select name="AWARDRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
|
<select name="AWARDRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 100px">
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||||
th:value="${dict.dictValue}"></option>
|
th:value="${dict.dictValue}"></option>
|
||||||
|
|
@ -80,7 +80,7 @@
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label>奖品类型：</label>
|
<label>奖品类型：</label>
|
||||||
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 80px">
|
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 120px">
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||||
th:value="${dict.dictValue}"></option>
|
th:value="${dict.dictValue}"></option>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||||
<head>
|
<head>
|
||||||
<th:block th:include="include :: header('抽奖次数消费信息列表')"/>
|
<th:block th:include="include :: header('抽奖次数使用明细')"/>
|
||||||
</head>
|
</head>
|
||||||
<body class="gray-bg">
|
<body class="gray-bg">
|
||||||
<div class="container-div">
|
<div class="container-div">
|
||||||
|
|
@ -47,14 +47,14 @@
|
||||||
<!-- <label>使用主键：</label>-->
|
<!-- <label>使用主键：</label>-->
|
||||||
<!-- <input type="text" name="TRADEORDERID"/>-->
|
<!-- <input type="text" name="TRADEORDERID"/>-->
|
||||||
<!-- </li>-->
|
<!-- </li>-->
|
||||||
<li>
|
<!-- <li>-->
|
||||||
<label>状态：</label>
|
<!-- <label>状态：</label>-->
|
||||||
<select name="STATE" th:with="type=${@dict.getType('status')}" style="width: 80px">
|
<!-- <select name="STATE" th:with="type=${@dict.getType('status')}" style="width: 80px">-->
|
||||||
<option value="">所有</option>
|
<!-- <option value="">所有</option>-->
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
|
||||||
th:value="${dict.dictValue}"></option>
|
<!-- th:value="${dict.dictValue}"></option>-->
|
||||||
</select>
|
<!-- </select>-->
|
||||||
</li>
|
<!-- </li>-->
|
||||||
<li>
|
<li>
|
||||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
|
||||||
class="fa fa-search"></i> 搜索</a>
|
class="fa fa-search"></i> 搜索</a>
|
||||||
|
|
@ -155,13 +155,13 @@
|
||||||
title: '使用主键',
|
title: '使用主键',
|
||||||
visible: false
|
visible: false
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
field: 'state',
|
// field: 'state',
|
||||||
title: '状态',
|
// title: '状态',
|
||||||
formatter: function (value, row, index) {
|
// formatter: function (value, row, index) {
|
||||||
return $.table.selectDictLabel(STATEDatas, value);
|
// return $.table.selectDictLabel(STATEDatas, value);
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
// {
|
// {
|
||||||
// field: 'lastupdatetimestamp',
|
// field: 'lastupdatetimestamp',
|
||||||
// title: '最后修改时间'
|
// title: '最后修改时间'
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<div class="select-list">
|
<div class="select-list">
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<label>奖品名称：</label>
|
<label>奖品代码：</label>
|
||||||
<input type="text" name="PRIZECODE"/>
|
<input type="text" name="PRIZECODE"/>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label>奖品类型：</label>
|
<label>奖品类型：</label>
|
||||||
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 100px">
|
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 120px">
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
<!-- </li>-->
|
<!-- </li>-->
|
||||||
<li>
|
<li>
|
||||||
<label>抽奖结果：</label>
|
<label>抽奖结果：</label>
|
||||||
<select name="DRAWRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
|
<select name="DRAWRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 100px">
|
||||||
<option value="">所有</option>
|
<option value="">所有</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||||
th:value="${dict.dictValue}"></option>
|
th:value="${dict.dictValue}"></option>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue