From cd5f52c1b5616bccbbd25c8a5e0ac0b6c80006a5 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 13:45:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E8=AE=B0=E5=BD=95=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 --- .../main/resources/static/ruoyi/js/ry-ui.js | 15 + .../activity/mapper/DrawPrizeInfoMapper.java | 2 + .../service/IDrawPrizeInfoService.java | 6 + .../impl/DrawPrizeInfoServiceImpl.java | 7 +- .../mapper/activity/DrawPrizeInfoMapper.xml | 4 + .../templates/activity/record/record.html | 339 ++++++++++-------- 6 files changed, 218 insertions(+), 155 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index e7dbce753..5e62e755c 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -525,6 +525,21 @@ var table = { }); return actions.join(''); }, + // 回显奖品名称 + selectprivename: function(datas, value) { + if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { + return ''; + } + var actions = []; + $.each(datas, function(index, draw) { + if (draw.prizecode == ('' + value)) { + var listClass = $.common.equals("default", draw.listClass) || $.common.isEmpty(draw.listClass) ? "" : "badge badge-" + draw.listClass; + actions.push($.common.sprintf("%s", listClass, draw.prizename)); + return false; + } + }); + return actions.join(''); + }, // 回显数据字典（字符串数组） selectDictLabels: function(datas, value, separator) { if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java index b0f16ce55..567c6b0a1 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java @@ -33,6 +33,8 @@ public interface DrawPrizeInfoMapper */ public List selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo); + List findDrawPrizeInfoList(); + /** * 新增存储奖品的基础信息 * diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java index 9de3daee9..81be02b7d 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java @@ -27,6 +27,12 @@ public interface IDrawPrizeInfoService */ public List selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo); + /** + * 奖品列表-下拉框 + * @return + */ + List findDrawPrizeInfoList(); + /** * 新增存储奖品的基础信息 * diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java index 70831ff96..d30523a76 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java @@ -15,7 +15,7 @@ import com.ruoyi.common.core.text.Convert; * @author dy * @date 2021-03-25 */ -@Service +@Service("drawPrize") public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService { @Autowired @@ -45,6 +45,11 @@ public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService return drawPrizeInfoMapper.selectDrawPrizeInfoList(drawPrizeInfo); } + @Override + public List findDrawPrizeInfoList() { + return drawPrizeInfoMapper.findDrawPrizeInfoList(); + } + /** * 新增存储奖品的基础信息 * diff --git a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml index 76ba67042..b9127e000 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml @@ -35,6 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and INTEGRALPROJECTCODE = #{INTEGRALPROJECTCODE} + + - -
  • - - -
    • - - - - - - - - -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • - - - - - - - - - - - - - - - - -
  • - - -
    • - - - - - - - - -
  • - - -
    • -
  • -  搜索 -  重置 -
    • - - - - +
    +
    +
    +
    +
    +
      + + + + +
    • + + +
      • +
    • + + +
      • + + + + +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    -
    - - - - - - - - - - - 导出 - -
    -
    -
    -
    +
    + + + + + + + + + + + 导出 + +
    +
    +
    - - + ] + }; + $.table.init(options); + }); + \ No newline at end of file