From afa0db58c478da275f9205993880687b83b5d5e0 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 31 Mar 2021 13:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=8F=91=E5=A5=96=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/awardRecord/add.html   |   2 +-
 .../templates/activity/awardRecord/edit.html  |   2 +-
 .../activity/awardRecord/record.html          | 415 ++++++++++--------
 .../templates/activity/prizeInfo/info.html    |   4 +-
 .../templates/activity/record/add.html        |   2 +-
 .../templates/activity/record/edit.html       |   2 +-
 .../templates/activity/record/record.html     |   4 +-
 7 files changed, 233 insertions(+), 198 deletions(-)
diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/add.html b/sino-activity/src/main/resources/templates/activity/awardRecord/add.html
index fd8b563db..7296a9083 100644
--- a/sino-activity/src/main/resources/templates/activity/awardRecord/add.html
+++ b/sino-activity/src/main/resources/templates/activity/awardRecord/add.html
@@ -14,7 +14,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html b/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
index f3e0dbd64..469875523 100644
--- a/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
@@ -15,7 +15,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
index 455c23f2d..ca08dcef3 100644
--- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
+++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
@@ -1,184 +1,203 @@
 <!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">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>活动代码：</label>
-                                <input type="text" name="DRAWCODE"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>奖品代码：</label>-->
-<!--                                <input type="text" name="PRIZECODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>用户标识：</label>-->
-<!--                                <input type="text" name="USERID"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>抽奖记录标识：</label>-->
-<!--                                <input type="text" name="DRAWRECORDID"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>发奖时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>发奖结果：</label>-->
-<!--                                <input type="text" name="AWARDRESULT"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>错误码：</label>-->
-<!--                                <input type="text" name="RETURNCODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>错误信息：</label>-->
-<!--                                <input type="text" name="RETURNMESSAGE"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>手机号：</label>
-                                <input type="text" name="PHONE"/>
-                            </li>
-                            <li>
-                                <label>用户名：</label>
-                                <input type="text" name="USERNAME"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>抽奖流水：</label>-->
-<!--                                <input type="text" name="DRAWTRANSEQNO"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>发奖流水：</label>-->
-<!--                                <input type="text" name="AWARDTRANSEQNO"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>奖品等级：</label>
-                                <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" 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="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" 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>-->
-<!--                                <input type="text" name="MERCHANTCODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>商户系统号：</label>-->
-<!--                                <input type="text" name="MERCHANTSYSCODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>渠道：</label>-->
-<!--                                <input type="text" name="CHANNEL"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>业务领域：</label>-->
-<!--                                <input type="text" name="BUSINESSAREA"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>城市：</label>-->
-<!--                                <input type="text" name="CITY"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>扩展：</label>-->
-<!--                                <input type="text" name="EXTID"/>-->
-<!--                            </li>-->
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>活动代码：</label>
+                            <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
+                                        th:value="${drawInfo.DRAWCODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>奖品名称：</label>
+                            <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                        th:value="${drawPrize.PRIZECODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>用户标识：</label>
+                            <input type="text" name="USERID"/>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>抽奖记录标识：</label>-->
+                        <!--                                <input type="text" name="DRAWRECORDID"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>发奖时间：</label>-->
+                        <!--                                <input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>发奖结果：</label>
+                            <input type="text" name="AWARDRESULT"/>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>错误码：</label>-->
+                        <!--                                <input type="text" name="RETURNCODE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>错误信息：</label>-->
+                        <!--                                <input type="text" name="RETURNMESSAGE"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>手机号：</label>
+                            <input type="text" name="PHONE"/>
+                        </li>
+                        <li>
+                            <label>用户名：</label>
+                            <input type="text" name="USERNAME"/>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>抽奖流水：</label>-->
+                        <!--                                <input type="text" name="DRAWTRANSEQNO"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>发奖流水：</label>-->
+                        <!--                                <input type="text" name="AWARDTRANSEQNO"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>奖品等级：</label>
+                            <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" 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="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" 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>-->
+                        <!--                                <input type="text" name="MERCHANTCODE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>商户系统号：</label>-->
+                        <!--                                <input type="text" name="MERCHANTSYSCODE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>渠道：</label>-->
+                        <!--                                <input type="text" name="CHANNEL"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>业务领域：</label>-->
+                        <!--                                <input type="text" name="BUSINESSAREA"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>城市：</label>-->
+                        <!--                                <input type="text" name="CITY"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>扩展：</label>-->
+                        <!--                                <input type="text" name="EXTID"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
+            <!--                    <i class="fa fa-plus"></i> 添加-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
+            <!--                    <i class="fa fa-edit"></i> 修改-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
+            <!--                    <i class="fa fa-remove"></i> 删除-->
+            <!--                </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
-        var prefix = ctx + "activity/award/record";
-        var datas = [[${@dict.getType('prizeLevel')}]];
-        var prizetypes = [[${@dict.getType('prizeType')}]];
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
+    var prefix = ctx + "activity/award/record";
+    var datas = [[${@dict.getType('prizeLevel')}]];
+    var prizetypes = [[${@dict.getType('prizeType')}]];
+    var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
+    var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "记录发奖信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "记录发奖信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'awardrecordid',
                     title: '主键',
                     visible: false
                 },
-                {
-                    field: 'drawcode',
-                    title: '抽奖活动代码'
-                },
-                {
-                    field: 'prizecode',
-                    title: '奖品代码'
-                },
                 {
                     field: 'userid',
                     title: '用户标识'
                 },
                 {
-                    field: 'drawrecordid',
-                    title: '抽奖记录标识'
+                    field: 'username',
+                    title: '用户名'
                 },
                 {
-                    field: 'awardtime',
-                    title: '发奖时间'
+                    field: 'drawcode',
+                    title: '活动名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDrawname(drawInfoList, value);
+                    }
+                },
+                {
+                    field: 'prizecode',
+                    title: '奖品名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectprivename(drawPrizeList, value);
+                    }
+                },
+                {
+                    field: 'prizetype',
+                    title: '奖品类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(prizetypes, value);
+                    }
                 },
                 {
                     field: 'awardresult',
                     title: '发奖结果'
                 },
                 {
-                    field: 'returncode',
-                    title: '错误码'
-                },
-                {
-                    field: 'returnmessage',
-                    title: '错误信息'
+                    field: 'awardtime',
+                    title: '发奖时间'
                 },
                 {
                     field: 'phone',
@@ -189,9 +208,22 @@
                     title: '地址'
                 },
                 {
-                    field: 'username',
-                    title: '用户名'
+                    field: 'drawrecordid',
+                    title: '抽奖记录标识',
+                    visible: false
                 },
+                {
+                    field: 'returncode',
+                    title: '错误码',
+                    visible: false
+                },
+                {
+                    field: 'returnmessage',
+                    title: '错误信息',
+                    visible: false
+                },
+
+
                 // {
                 //     field: 'createtimestamp',
                 //     title: '创建时间'
@@ -202,50 +234,53 @@
                 // },
                 {
                     field: 'drawtranseqno',
-                    title: '抽奖流水'
+                    title: '抽奖流水',
+                    visible: false
                 },
                 {
                     field: 'awardtranseqno',
-                    title: '发奖流水'
+                    title: '发奖流水',
+                    visible: false
                 },
                 {
                     field: 'prizelevel',
                     title: '奖品等级',
-                    formatter: function(value, row, index) {
+                    visible: false,
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(datas, value);
                     }
                 },
+
                 {
-                    field: 'prizetype',
-                    title: '奖品类型',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(prizetypes, value);
-                    }
+                    field: 'merchantcode',
+                    title: '商户号',
+                    visible: false
+                },
+                {
+                    field: 'merchantsyscode',
+                    title: '商户系统号',
+                    visible: false
+                },
+                {
+                    field: 'channel',
+                    title: '渠道',
+                    visible: false
+                },
+                {
+                    field: 'businessarea',
+                    title: '业务领域',
+                    visible: false
                 },
-                // {
-                //     field: 'merchantcode',
-                //     title: '商户号'
-                // },
-                // {
-                //     field: 'merchantsyscode',
-                //     title: '商户系统号'
-                // },
-                // {
-                //     field: 'channel',
-                //     title: '渠道'
-                // },
-                // {
-                //     field: 'businessarea',
-                //     title: '业务领域'
-                // },
                 {
                     field: 'city',
-                    title: '城市'
+                    title: '城市',
+                    visible: false
+                },
+                {
+                    field: 'extid',
+                    title: '扩展',
+                    visible: false
                 },
-                // {
-                //     field: 'extid',
-                //     title: '扩展'
-                // },
                 // {
                 //     title: '操作',
                 //     align: 'center',
@@ -256,10 +291,10 @@
                 //         return actions.join('');
                 //     }
                 // }
-                ]
-            };
-            $.table.init(options);
-        });
-    </script>
+            ]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
index 73b3004b7..bfce2a8d7 100644
--- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
+++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
@@ -11,7 +11,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>奖品代码：</label>
+                                <label>奖品名称：</label>
                                 <input type="text" name="PRIZECODE"/>
                             </li>
                             <li>
@@ -101,7 +101,7 @@
                 },
                 {
                     field: 'prizecode',
-                    title: '奖品代码'
+                    title: '奖品名称'
                 },
                 {
                     field: 'prizename',
diff --git a/sino-activity/src/main/resources/templates/activity/record/add.html b/sino-activity/src/main/resources/templates/activity/record/add.html
index 987ea0b78..9481bc051 100644
--- a/sino-activity/src/main/resources/templates/activity/record/add.html
+++ b/sino-activity/src/main/resources/templates/activity/record/add.html
@@ -41,7 +41,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/record/edit.html b/sino-activity/src/main/resources/templates/activity/record/edit.html
index 336407fac..181e090e6 100644
--- a/sino-activity/src/main/resources/templates/activity/record/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/record/edit.html
@@ -42,7 +42,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html
index 7a7d2fe10..4e7455ede 100644
--- a/sino-activity/src/main/resources/templates/activity/record/record.html
+++ b/sino-activity/src/main/resources/templates/activity/record/record.html
@@ -35,7 +35,7 @@
                             <input type="text" name="DRAWRESULT"/>
                         </li>
                         <li>
-                            <label>奖品代码：</label>
+                            <label>奖品名称：</label>
                             <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
                                 <option value="">所有</option>
                                 <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
@@ -160,7 +160,7 @@
                 },
                 {
                     field: 'drawcode',
-                    title: '抽奖活动代码',
+                    title: '活动名称',
                     formatter: function (value, row, index) {
                         return $.table.selectDrawname(drawInfoList, value);
                     }
