diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java index 5aaa33001..dd867593b 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java @@ -5,8 +5,10 @@ import java.util.Date; import java.util.List; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.sinosoft.activity.domain.DrawAwardRecord; import com.sinosoft.activity.domain.DrawConfig; import com.sinosoft.activity.domain.DrawPrizeInfo; +import com.sinosoft.activity.service.IDrawAwardRecordService; import com.sinosoft.activity.service.IDrawConfigService; import com.sinosoft.activity.service.IDrawPrizeInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -42,6 +44,8 @@ public class DrawConfigController extends BaseController @Autowired private IDrawPrizeInfoService iDrawPrizeInfoService; + @Autowired + private IDrawAwardRecordService iDrawAwardRecordService; @RequiresPermissions("activity:config:view") @GetMapping() public String config() @@ -102,11 +106,13 @@ public class DrawConfigController extends BaseController /** * 修改存储奖项配置信息 */ - @GetMapping("/edit/{DRAWCONFIGID}") - public String edit(@PathVariable("DRAWCONFIGID") String DRAWCONFIGID, ModelMap mmap) + @GetMapping("/edit/{DRAWCONFIGID}/{PRIZECODE}/{DRAWCODE}") + public String edit(@PathVariable("DRAWCONFIGID") String DRAWCONFIGID,@PathVariable("PRIZECODE") String PRIZECODE ,@PathVariable("DRAWCODE") String DRAWCODE ,ModelMap mmap) { DrawConfig drawConfig = drawConfigService.selectDrawConfigById(DRAWCONFIGID); + DrawAwardRecord drawAwardRecord = iDrawAwardRecordService.selectDrawAwardRecordCount(DRAWCODE, PRIZECODE); mmap.put("drawConfig", drawConfig); + mmap.put("count", drawAwardRecord.getCount()); return prefix + "/configEdit"; } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawAwardRecord.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawAwardRecord.java index 907248172..0f54ef29a 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawAwardRecord.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawAwardRecord.java @@ -115,7 +115,17 @@ public class DrawAwardRecord extends BaseEntity @Excel(name = "扩展") private String EXTID; - public void setAWARDRECORDID(String AWARDRECORDID) + private Integer count; + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public void setAWARDRECORDID(String AWARDRECORDID) { this.AWARDRECORDID = AWARDRECORDID; } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawAwardRecordMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawAwardRecordMapper.java index a76c361b1..a191ff7d8 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawAwardRecordMapper.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawAwardRecordMapper.java @@ -58,4 +58,12 @@ public interface DrawAwardRecordMapper * @return 结果 */ public int deleteDrawAwardRecordByIds(String[] AWARDRECORDIDs); + + /** + * 获取已发放奖品数量 + * @param drawAwardRecord + * @return + */ + public DrawAwardRecord selectDrawAwardRecordCount(DrawAwardRecord drawAwardRecord); + } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawAwardRecordService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawAwardRecordService.java index 6d7a54020..b8f415561 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawAwardRecordService.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawAwardRecordService.java @@ -58,4 +58,11 @@ public interface IDrawAwardRecordService * @return 结果 */ public int deleteDrawAwardRecordById(String AWARDRECORDID); + + /** + * 获取已发放奖品数量 + * @param DRAWCODE + * @param prizecode + */ + public DrawAwardRecord selectDrawAwardRecordCount(String DRAWCODE, String prizecode); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java index b11dbfd57..2145eaca9 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java @@ -8,7 +8,7 @@ import java.util.List; /** * 存储抽奖特殊规则对象Service接口 * - * @author ruoyi + * @author xlh * @date 2021-03-25 */ public interface IDrawRuleService diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawAwardRecordServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawAwardRecordServiceImpl.java index 3882a0996..64cb40efc 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawAwardRecordServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawAwardRecordServiceImpl.java @@ -91,4 +91,17 @@ public class DrawAwardRecordServiceImpl implements IDrawAwardRecordService { return drawAwardRecordMapper.deleteDrawAwardRecordById(AWARDRECORDID); } + + /** + * 获取已发放奖品数量 + * @param DRAWCODE + * @param prizecode + */ + @Override + public DrawAwardRecord selectDrawAwardRecordCount(String DRAWCODE, String prizecode) { + DrawAwardRecord drawAwardRecord = new DrawAwardRecord(); + drawAwardRecord.setDRAWCODE(DRAWCODE); + drawAwardRecord.setPRIZECODE(prizecode); + return drawAwardRecordMapper.selectDrawAwardRecordCount(drawAwardRecord); + } } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java index b612191a0..29497fb44 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java @@ -13,7 +13,7 @@ import com.ruoyi.common.core.text.Convert; /** * 抽奖活动管理对象Service业务层处理 * - * @author ruoyi + * @author xlh * @date 2021-03-25 */ @Service diff --git a/sino-activity/src/main/resources/mapper/activity/DrawAwardRecordMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawAwardRecordMapper.xml index c02bb2910..00a546635 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawAwardRecordMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawAwardRecordMapper.xml @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -166,4 +167,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html index d7cb4194f..86e1c77d6 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -54,7 +54,7 @@
- +
@@ -65,7 +65,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -132,7 +132,7 @@
- +
@@ -221,27 +221,47 @@ $("input[name='STARTTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); $("input[name='ENDTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); $("input[name='DAILYSTARTTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); $("input[name='DAILYENDTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); diff --git a/sino-activity/src/main/resources/templates/activity/info/configAdd.html b/sino-activity/src/main/resources/templates/activity/info/configAdd.html index 05a812304..ec5f877bc 100644 --- a/sino-activity/src/main/resources/templates/activity/info/configAdd.html +++ b/sino-activity/src/main/resources/templates/activity/info/configAdd.html @@ -52,7 +52,7 @@
- +
@@ -60,7 +60,7 @@
- +
@@ -127,7 +127,10 @@ $("#form-info-add").validate({ focusCleanup: true }); - + function total(){ + var totalnumber = $("#totalnumber").val(); + $("#availablenumber").val(totalnumber) + } /**获取奖品及信息列表*/ $(document).ready(function() { var job= ""; diff --git a/sino-activity/src/main/resources/templates/activity/info/configEdit.html b/sino-activity/src/main/resources/templates/activity/info/configEdit.html index 7adc2e90a..8900af38e 100644 --- a/sino-activity/src/main/resources/templates/activity/info/configEdit.html +++ b/sino-activity/src/main/resources/templates/activity/info/configEdit.html @@ -8,6 +8,7 @@
+
@@ -52,7 +53,7 @@
- +
@@ -60,7 +61,7 @@
- +
@@ -68,7 +69,7 @@
- +
+
  • @@ -27,15 +27,12 @@ 添加 - + 修改 删除 - - 导出 -
    • @@ -56,10 +53,9 @@ var options = { url: prefix + "/" + DRAWCODE + "/list", createUrl: prefix + "/add/{id}", - updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "存储奖项配置信息", + modalName: "奖项信息", columns: [{ checkbox: true }, @@ -141,6 +137,23 @@ }; $.table.init(options); }); + + + function edit() { + var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + var rows = $('#bootstrap-table').bootstrapTable('getSelections') + var prizecode = ""; + for (var i = 0; i < rows.length; i++) { + if (i == 0 || i == "0") { + prizecode += rows[i].prizecode; + } else { + prizecode += "," + rows[i].prizecode; + } + } + var drawcode = $("#DRAWCODE").val(); + var url = prefix +'/edit/' + id +"/" + prizecode +"/" + drawcode; + $.modal.open("修改" + table.options.modalName, url); + } \ No newline at end of file diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html index 518ff5f26..0c8ad82ef 100644 --- a/sino-activity/src/main/resources/templates/activity/info/edit.html +++ b/sino-activity/src/main/resources/templates/activity/info/edit.html @@ -56,7 +56,7 @@
    - +
    @@ -67,7 +67,7 @@
    - +
    @@ -123,7 +123,7 @@
    - +
    @@ -134,7 +134,7 @@
    - +
    @@ -247,27 +247,47 @@ }); $("input[name='STARTTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); $("input[name='ENDTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); $("input[name='DAILYSTARTTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); $("input[name='DAILYENDTIME']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii:ss' }); diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/info/info.html index 9779375e9..959dae613 100644 --- a/sino-activity/src/main/resources/templates/activity/info/info.html +++ b/sino-activity/src/main/resources/templates/activity/info/info.html @@ -107,11 +107,11 @@ }, { - field: 'STARTTIME', + field: 'starttime', title: '开始时间' }, { - field: 'ENDTIME', + field: 'endtime', title: '结束时间' },