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