diff --git a/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java b/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java index b4f902639..a4d5cc160 100644 --- a/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java +++ b/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java @@ -271,19 +271,17 @@ public class ActiveInfoController extends BaseController // return prefix + "/tree"; // } -// /** -// * 角色状态修改 -// */ -// @Log(title = "角色管理", businessType = BusinessType.UPDATE) -// @RequiresPermissions("system:role:edit") -// @PostMapping("/changeStatus") -// @ResponseBody -// public AjaxResult changeStatus(SysRole role) -// { -// roleService.checkRoleAllowed(role); -// roleService.checkRoleDataScope(role.getRoleId()); -// return toAjax(roleService.changeStatus(role)); -// } + /** + * 状态修改 + */ + @Log(title = "活动上下线状态管理", businessType = BusinessType.UPDATE) + @RequiresPermissions("active:info:edit") + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(@Validated ActiveInfo activeInfo) + { + return toAjax(activeInfoService.updateActive(activeInfo)); + } // /** // * 分配用户 diff --git a/zt-admin/src/main/resources/templates/active/info/add.html b/zt-admin/src/main/resources/templates/active/info/add.html index 2cd614291..4938c1295 100644 --- a/zt-admin/src/main/resources/templates/active/info/add.html +++ b/zt-admin/src/main/resources/templates/active/info/add.html @@ -29,6 +29,14 @@ +
+ +
+ +
+
diff --git a/zt-admin/src/main/resources/templates/active/info/edit.html b/zt-admin/src/main/resources/templates/active/info/edit.html index 8763b641a..e6659cb62 100644 --- a/zt-admin/src/main/resources/templates/active/info/edit.html +++ b/zt-admin/src/main/resources/templates/active/info/edit.html @@ -56,6 +56,14 @@
+
+ +
+ +
+
@@ -63,7 +71,7 @@
- +
+ 活动标题：
  • - 活动状态： @@ -118,15 +118,29 @@ title: '活动状态', sortable: true, formatter: function(value, item, index) { - if (item.status == '1') { - return '进行中'; + if (item.status == '0') { + return '未开始'; } - else if (item.status == '2') { - return '报名中'; - } else if (item.status == '3') { + else if (item.status == '1') { + return '进行中'; + } else if (item.status == '2') { return '已结束'; } + } + }, + { + field: 'status', + title: '报名要求', + sortable: true, + formatter: function(value, item, index) { + if (item.isEnroll == '0') { + return '不需要报名'; + } + else if (item.isEnroll == '1') { + return '需要报名'; + } + } }, { @@ -153,11 +167,11 @@ sortable: true }, - { - field: 'createTime', - title: '创建时间', - sortable: true - }, + + + + + { title: '操作', align: 'center', @@ -167,6 +181,10 @@ actions.push('编辑 '); actions.push('删除 '); actions.push('设为首页 '); + var more = []; + more.push("活动上线 "); + more.push("活动下线"); + actions.push('更多操作'); return actions.join(''); } else { return ""; @@ -205,13 +223,20 @@ } } - /* 活动管理-停用 */ - function disable(roleId) { - $.modal.confirm("确认要停用角色吗？", function() { + /* 活动管理-上线 */ + function online(id) { + $.modal.confirm("确认要设置活动上线吗？", function() { $.operate.post(prefix + "/changeStatus", { "id": id, "status": 1 }); }) } + /* 活动管理-下线 */ + function Offline(id) { + $.modal.confirm("确认要设置活动下线吗？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "status": 2 }); + }) + } + /* 活动管理启用 */ function enable(roleId) { $.modal.confirm("确认要启用角色吗？", function() { diff --git a/zt-admin/src/main/resources/templates/active/user/index.html b/zt-admin/src/main/resources/templates/active/user/index.html index 4adcd1905..635655d66 100644 --- a/zt-admin/src/main/resources/templates/active/user/index.html +++ b/zt-admin/src/main/resources/templates/active/user/index.html @@ -10,13 +10,15 @@
      -
    • - 报名用户编号： -
    • 活动标题：
      • - +
    • + EPC号： +
      • +
    • + 手机号码： +
    •  搜索 @@ -52,8 +54,8 @@ checkbox: true }, { - field: 'id', - title: '报名用户编号' + field: 'qrCode', + title: 'EPC号' }, { field: 'nickName', diff --git a/zt-admin/src/main/resources/templates/enroll/user/index.html b/zt-admin/src/main/resources/templates/enroll/user/index.html index 3a6ba54cf..eedef0e8d 100644 --- a/zt-admin/src/main/resources/templates/enroll/user/index.html +++ b/zt-admin/src/main/resources/templates/enroll/user/index.html @@ -11,12 +11,17 @@
      • - 报名用户编号： + EPC号： +
        • +
      • + 昵称：
      • 职务：
        • - +
      • + 手机号码： +
      •  搜索 @@ -52,8 +57,8 @@ checkbox: true }, { - field: 'id', - title: '报名用户编号' + field: 'qrCode', + title: 'EPC号' }, { field: 'nickName', diff --git a/zt-system/src/main/java/com/wuzhen/system/domain/ActiveInfo.java b/zt-system/src/main/java/com/wuzhen/system/domain/ActiveInfo.java index d86bb0533..f630404ba 100644 --- a/zt-system/src/main/java/com/wuzhen/system/domain/ActiveInfo.java +++ b/zt-system/src/main/java/com/wuzhen/system/domain/ActiveInfo.java @@ -91,6 +91,14 @@ public class ActiveInfo extends BaseEntity { @Excel(name = "活动地址") private String address; + + /** + * 活动报名类型 + */ + @Excel(name = "活动报名类型") + private String isEnroll; + + public String getAddress() { return address; } @@ -219,6 +227,17 @@ public class ActiveInfo extends BaseEntity { this.activePicUrl = activePicUrl; } + + + public String getIsEnroll() { + return isEnroll; + } + + public void setIsEnroll(String isEnroll) { + this.isEnroll = isEnroll; + } + + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java b/zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java index 6233d059d..f3d971cf7 100644 --- a/zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java +++ b/zt-system/src/main/java/com/wuzhen/system/domain/EnrollActiveUser.java @@ -68,9 +68,16 @@ public class EnrollActiveUser extends BaseEntity { @Excel(name = "活动标题") private String activeTitle; + @Excel(name = "EPC号") + private String qrCode; + public String getQrCode() { + return qrCode; + } - + public void setQrCode(String qrCode) { + this.qrCode = qrCode; + } public String getNickName() { return nickName; diff --git a/zt-system/src/main/java/com/wuzhen/system/domain/EnrollUser.java b/zt-system/src/main/java/com/wuzhen/system/domain/EnrollUser.java index 4ff7f4cbf..4516557f3 100644 --- a/zt-system/src/main/java/com/wuzhen/system/domain/EnrollUser.java +++ b/zt-system/src/main/java/com/wuzhen/system/domain/EnrollUser.java @@ -60,7 +60,16 @@ public class EnrollUser extends BaseEntity { @Excel(name = "推荐人编号") private String recommenderNo; + @Excel(name = "EPC号") + private String qrCode; + public String getQrCode() { + return qrCode; + } + + public void setQrCode(String qrCode) { + this.qrCode = qrCode; + } public String getNickName() { return nickName; diff --git a/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml b/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml index f2113ee7d..bfcffe3b9 100644 --- a/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml +++ b/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml @@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select r.id, r.active_title, r.active_desc,r.active_start_date,r.active_end_date, r.active_pic_url, r.active_frist_pic_url,r.is_frist_page, r.active_type, r.status, r.del_flag, r.create_time, r.remark, r.address + select r.id, r.active_title, r.active_desc,r.active_start_date,r.active_end_date, r.active_pic_url, r.active_frist_pic_url,r.is_frist_page, r.active_type, r.status, r.del_flag, r.create_time, r.remark, r.address,r.is_enroll from active_info r @@ -92,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, update_by = #{updateBy}, address = #{address}, + is_enroll = #{isEnroll}, update_time = sysdate() where id = #{id} @@ -121,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, create_by, address, + is_enroll create_time )values( #{activeTitle}, @@ -133,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, #{createBy}, #{address}, + #{isEnroll}, sysdate() ) diff --git a/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml b/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml index eb65a33ba..9577f607e 100644 --- a/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml +++ b/zt-system/src/main/resources/mapper/system/ActiveUserMapper.xml @@ -16,11 +16,12 @@ + - select e.id, e.nick_name, e.post_name, e.phone_number, e.playbill_address,e.recommender_no,e.create_by, e.create_time, e.remark,a.active_title + select e.id, e.nick_name, e.post_name, e.phone_number, e.playbill_address,e.recommender_no,e.create_by, e.create_time, e.remark,a.active_title,e.qr_code from enroll_user e inner join active_info a ON e.active_no = a.id @@ -31,9 +32,15 @@ AND e.id like concat('%', #{id}, '%') + + AND e.qr_code like concat('%', #{qrCode}, '%') + AND a.active_title like concat('%', #{activeTitle}, '%') + + AND e.phone_number like concat('%', #{phoneNumber}, '%') + diff --git a/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml b/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml index d3470c95d..cc9cb138a 100644 --- a/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml +++ b/zt-system/src/main/resources/mapper/system/EnrollUserMapper.xml @@ -15,11 +15,12 @@ + - select id, nick_name, post_name, phone_number, playbill_address,recommender_no,create_by, create_time, remark + select id, nick_name, post_name, phone_number, playbill_address,recommender_no,create_by, create_time, remark,qr_code from enroll_user @@ -30,9 +31,18 @@ AND id like concat('%', #{id}, '%') + + AND qr_code like concat('%', #{qrCode}, '%') + + + AND nick_name like concat('%', #{nickName}, '%') + AND post_name like concat('%', #{postName}, '%') + + AND phone_number like concat('%', #{phoneNumber}, '%') +