ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/activity' into activity

This commit is contained in:
dy 2021-03-31 09:16:26 +08:00
parent 961c3630f2 86290b50de
commit 42e7ccc241
8 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
View File

@ -60,7 +60,7 @@ public class DrawConfig extends BaseEntity
private Long AVAILABLENUMBER; private Long AVAILABLENUMBER;
/** 状态 */ /** 状态 */
@Excel(name = "状态" ,readConverterExp="1=启用,2=禁用") @Excel(name = "状态" ,readConverterExp="1=启用,2=停用")
private String STATUS; private String STATUS;
/** 创建时间 */ /** 创建时间 */

2
sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
View File

@ -62,7 +62,7 @@ public class DrawInfo extends DrawRule
private Date LASTUPDATETIMESTAMP; private Date LASTUPDATETIMESTAMP;
/** 状态 */ /** 状态 */
@Excel(name = "状态" ,readConverterExp="1=启用,2=禁用") @Excel(name = "状态" ,readConverterExp="1=启用,2=停用")
private String STATUS; private String STATUS;
/** 是否需要更新缓存 */ /** 是否需要更新缓存 */

11
sino-activity/src/main/resources/templates/activity/info/add.html
View File

@ -110,7 +110,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">时间段限制次数：</label> <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="DAILYNUMBER" placeholder="活动名称" class="form-control" type="text" maxlength="30"> <input name="DAILYNUMBER" placeholder="时间段限制次数" class="form-control" type="text" maxlength="30">
</div> </div>
</div> </div>
</div> </div>
@ -183,14 +183,19 @@
/**获取奖品及信息列表*/ /**获取奖品及信息列表*/
$(document).ready(function() { $(document).ready(function() {
var job= "<option value=''>所有</option>"; var job= "";
$.ajax({ $.ajax({
url:prefix + "/prizeInfo", url:prefix + "/prizeInfo",
success: function (data) { success: function (data) {
for(var i in data){ for(var i in data){
job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>" if (job.length==0){
job = "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
}
else{
job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
}
} }
$("#firstawardprize").html(job); $("#firstawardprize").html(job);
$("#willdrawawardprize").html(job); $("#willdrawawardprize").html(job);

12
sino-activity/src/main/resources/templates/activity/info/configAdd.html
View File

@ -130,14 +130,22 @@
/**获取奖品及信息列表*/ /**获取奖品及信息列表*/
$(document).ready(function() { $(document).ready(function() {
var job= "<option value=''>所有</option>"; var job= "";
$.ajax({ $.ajax({
url:prefix + "/prizeInfo", url:prefix + "/prizeInfo",
success: function (data) { success: function (data) {
for(var i in data){ for(var i in data){
job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>" if(job.length==0){
job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
}else{
job += "<option value='"+data[i].prizecode+"'>"+data[i].prizename+"</option>"
}
} }
$("#PRIZECODE").html(job); $("#PRIZECODE").html(job);
}, },

22
sino-activity/src/main/resources/templates/activity/info/configEdit.html
View File

@ -14,7 +14,7 @@
<label class="col-sm-4 control-label is-required">奖项名称：</label> <label class="col-sm-4 control-label is-required">奖项名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="PRIZELEVEL" class="form-control" th:with="type=${@dict.getType('prizeLevel')}"> <select name="PRIZELEVEL" class="form-control" th:with="type=${@dict.getType('prizeLevel')}">
<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}" th:field="*{PRIZELEVEL}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -71,7 +71,7 @@
<label class="col-sm-4 control-label is-required">奖品发放制度：</label> <label class="col-sm-4 control-label is-required">奖品发放制度：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="AWARDTYPE" class="form-control" th:with="type=${@dict.getType('AWARDTYPE')}"> <select name="AWARDTYPE" class="form-control" th:with="type=${@dict.getType('AWARDTYPE')}">
<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}" th:field="*{AWARDTYPE}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -91,7 +91,7 @@
<label class="col-sm-4 control-label is-required">领取方式：</label> <label class="col-sm-4 control-label is-required">领取方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="AWARDMETHOD" class="form-control" th:with="type=${@dict.getType('AWARDMETHOD')}"> <select name="AWARDMETHOD" class="form-control" th:with="type=${@dict.getType('AWARDMETHOD')}">
<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}" th:field="*{AWARDMETHOD}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -101,7 +101,7 @@
<label class="col-sm-4 control-label is-required">状态：</label> <label class="col-sm-4 control-label is-required">状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}"> <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
<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}" th:field="*{STATUS}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -132,17 +132,27 @@
$(document).ready(function() { $(document).ready(function() {
var PRIZECODE = [[${drawConfig.PRIZECODE}]]; var PRIZECODE = [[${drawConfig.PRIZECODE}]];
var job= "<option value=''>所有</option>"; var job= "";
$.ajax({ $.ajax({
url:prefix + "/prizeInfo", url:prefix + "/prizeInfo",
success: function (data) { success: function (data) {
for(var i in data){ for(var i in data){
if(data[i].prizecode==PRIZECODE){ if (job.length==0){
if(data[i].prizecode==PRIZECODE){
job = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
}
job = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
}else{
if(data[i].prizecode==PRIZECODE){
job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>" job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
} }
job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>" job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
}
} }
$("#PRIZECODE").html(job); $("#PRIZECODE").html(job);

4
sino-activity/src/main/resources/templates/activity/info/configList.html
View File

@ -11,11 +11,11 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li > <li >
<label>奖品代码：</label> <label>活动编码：</label>
<input type="text" name="DRAWCODE" th:value="${DRAWCODE}" readonly/> <input type="text" name="DRAWCODE" th:value="${DRAWCODE}" readonly/>
</li> </li>
<li > <li >
<label>奖品名称：</label> <label>活动名称：</label>
<input type="text" name="DRAWNAME" th:value="${DRAWNAME}" readonly/> <input type="text" name="DRAWNAME" th:value="${DRAWNAME}" readonly/>
</li> </li>
</ul> </ul>

38
sino-activity/src/main/resources/templates/activity/info/edit.html
View File

@ -112,7 +112,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">时间段限制次数：</label> <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="DAILYNUMBER" th:field="*{DAILYNUMBER}" placeholder="活动名称" class="form-control" type="text" maxlength="30"> <input name="DAILYNUMBER" th:field="*{DAILYNUMBER}" placeholder="时间段限制次数" class="form-control" type="text" maxlength="30">
</div> </div>
</div> </div>
</div> </div>
@ -196,27 +196,43 @@
var WILLDRAWAWARDPRIZE = [[${drawInfo.WILLDRAWAWARDPRIZE}]]; var WILLDRAWAWARDPRIZE = [[${drawInfo.WILLDRAWAWARDPRIZE}]];
var FIRSTAWARDPRIZE = [[${drawInfo.FIRSTAWARDPRIZE}]]; var FIRSTAWARDPRIZE = [[${drawInfo.FIRSTAWARDPRIZE}]];
var job= "<option value=''>所有</option>"; var job= "";
var jobj= "<option value=''>所有</option>"; var jobj= "";
$.ajax({ $.ajax({
url:prefix + "/prizeInfo", url:prefix + "/prizeInfo",
success: function (data) { success: function (data) {
for(var i in data){ for(var i in data){
if(data[i].prizecode==WILLDRAWAWARDPRIZE){ if (job.length==0){
job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>" if(data[i].prizecode==WILLDRAWAWARDPRIZE){
} job = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>" }
job = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
}
else{
if(data[i].prizecode==WILLDRAWAWARDPRIZE){
job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
}
job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
}
} }
$("#willdrawawardprize").html(job); $("#willdrawawardprize").html(job);
for(var i in data){ for(var i in data){
if(data[i].prizecode==FIRSTAWARDPRIZE){ if(jobj.length==0){
jobj += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>" if(data[i].prizecode==FIRSTAWARDPRIZE){
} jobj = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
jobj += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>" }
jobj = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
}else{
if(data[i].prizecode==FIRSTAWARDPRIZE){
jobj += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
}
jobj += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
}
} }
$("#firstawardprize").html(jobj); $("#firstawardprize").html(jobj);

8
sino-activity/src/main/resources/templates/activity/info/info.html
View File

@ -80,16 +80,16 @@
{ {
field: 'drawtype', field: 'drawtype',
title: '抽奖活动类型', title: '活动类型',
visible: false visible: false
}, },
{ {
field: 'drawname', field: 'drawname',
title: '抽奖活动名称' title: '活动名称'
}, },
{ {
field: 'drawcode', field: 'drawcode',
title: '抽奖活动代码', title: '活动编码',
}, },
{ {
field: 'expeno', field: 'expeno',
@ -166,7 +166,7 @@
DRAWCODE = (drawcode.length) >0 ?drawcode :null; DRAWCODE = (drawcode.length) >0 ?drawcode :null;
DRAWNAME = (drawname.length) >0? drawname :null; DRAWNAME = (drawname.length) >0? drawname :null;
var url = prefix +'/prizeDetail/' + DRAWCODE +"/" + encodeURIComponent(encodeURIComponent(DRAWNAME));; var url = prefix +'/prizeDetail/' + DRAWCODE +"/" + encodeURIComponent(encodeURIComponent(DRAWNAME));;
$.modal.openInFoFull("奖品维护", url) $.modal.openInFoFull("奖项维护", url)
} }
</script> </script>
</body> </body>