From b9f674e4f84cd6d6e04a1753f14ac8dd6174cd6b Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 31 Mar 2021 14:14:11 +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

---
 .../activity/DrawTaskNotify/DrawTaskNotify.html      |  8 ++++----
 .../templates/activity/awardRecord/record.html       | 12 ++++++++++--
 .../resources/templates/activity/record/record.html  | 12 ++++++++++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
index 4f1349e08..0eac32e16 100644
--- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
+++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
@@ -23,10 +23,10 @@
                             <input type="text" name="TASKID"/>
                         </li>
 
-                        <!--                            <li>-->
-                        <!--                                <label>可用次数：</label>-->
-                        <!--                                <input type="text" name="AVAILABLENUMBER"/>-->
-                        <!--                            </li>-->
+                                                    <li>
+                                                        <label>用户标识：</label>
+                                                        <input type="text" name="USERID"/>
+                                                    </li>
                         <!--                            <li>-->
                         <!--                                <label>手机号：</label>-->
                         <!--                                <input type="text" name="PHONE"/>-->
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 ca08dcef3..bdd0e2901 100644
--- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
+++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
@@ -40,7 +40,11 @@
                         <!--                            </li>-->
                         <li>
                             <label>发奖结果：</label>
-                            <input type="text" name="AWARDRESULT"/>
+                            <select name="AWARDRESULT" th:with="type=${@dict.getType('drawResult')}" 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>-->
@@ -143,6 +147,7 @@
     var prefix = ctx + "activity/award/record";
     var datas = [[${@dict.getType('prizeLevel')}]];
     var prizetypes = [[${@dict.getType('prizeType')}]];
+    var drawResults = [[${@dict.getType('drawResult')}]];
     var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
     var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
 
@@ -193,7 +198,10 @@
                 },
                 {
                     field: 'awardresult',
-                    title: '发奖结果'
+                    title: '发奖结果',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(drawResults, value);
+                    }
                 },
                 {
                     field: 'awardtime',
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 4e7455ede..d84105c45 100644
--- a/sino-activity/src/main/resources/templates/activity/record/record.html
+++ b/sino-activity/src/main/resources/templates/activity/record/record.html
@@ -32,7 +32,11 @@
                         <!--                            </li>-->
                         <li>
                             <label>抽奖结果：</label>
-                            <input type="text" name="DRAWRESULT"/>
+                            <select name="DRAWRESULT" th:with="type=${@dict.getType('drawResult')}" 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>
@@ -127,6 +131,7 @@
     var prefix = ctx + "activity/record";
     var datas = [[${@dict.getType('prizeLevel')}]];
     var prizetypes = [[${@dict.getType('prizeType')}]];
+    var drawResults = [[${@dict.getType('drawResult')}]];
     var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
     var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
 
@@ -167,7 +172,10 @@
                 },
                 {
                     field: 'drawresult',
-                    title: '抽奖结果'
+                    title: '抽奖结果',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(drawResults, value);
+                    }
                 },
                 {
                     field: 'prizecode',