diff --git a/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java b/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java index 38e98d2..155608f 100644 --- a/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java +++ b/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java @@ -9,6 +9,7 @@ import io.v.nutz.annontation.ViReturn; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Vi; import io.v.nutz.lxy.model.Lxy_bm; +import io.v.nutz.lxy.model.Lxy_grxx; import io.v.nutz.lxy.service.LxyGrxxService; import io.v.nutz.lxy.service.LxyHdService; import io.v.nutz.util.ShiroUtil; @@ -16,11 +17,13 @@ import io.v.nutz.util.ViTool; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.entity.Record; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.Static; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; @@ -196,4 +199,17 @@ public class LxyHdTjController { }); return null; } + + + @At + @ViReturn + @Aop(TransAop.READ_COMMITTED) + @RequiresPermissions("zgfw.lxy.hdtj") + public Object doDelete(String id) { + Lxy_grxx grxx = lxyGrxxService.fetch(id); + lxyGrxxService.dao().clear(Lxy_bm.class, Cnd.where("hdid", "=", grxx.getHdid()) + .and("userid", "=", grxx.getUserid())); + lxyGrxxService.delete(id); + return null; + } } diff --git a/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java b/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java index 36b6cce..2335a15 100644 --- a/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java +++ b/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java @@ -103,7 +103,7 @@ public class MsgNotifyController { @At @ViReturn @RequiresAuthentication - public Object pageData(PageForm pageForm, String[] users) { + public Object pageData(PageForm pageForm, Integer isMember, String[] users) { Sql sql = Sqls.create(""" SELECT @@ -114,11 +114,14 @@ public class MsgNotifyController { unitname unitName, mobile, unionname unionName - from user + from user $condition """); CndPlus cnd = CndPlus.create(); - cnd.andExcludeEmpty("member", "=", 1); +// cnd.andExcludeEmpty("member", "=", 1); + if (isMember != null) { + cnd.and("member", "=", isMember); + } if (users.length > 0) { cnd.andExcludeEmpty("id", "not in", users); } diff --git a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java index 036f5ae..a1e77b7 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java @@ -40,7 +40,7 @@ public class WakesHomeDeclarationApplyController { @ViReturn @RequiresPermissions("wakeshome.declaration.apply") public Object doSave(WakesHomeApply wakesHomeApply) { - wakesHomeApply.setState("10020"); + wakesHomeApply.setState("10000"); if (wakesHomeApply != null) { if (StrUtil.isNotBlank(wakesHomeApply.getId())) { wakesHomeApplyService.update(wakesHomeApply); diff --git a/src/main/resources/static/components/msgNotify/msgNotify.vue b/src/main/resources/static/components/msgNotify/msgNotify.vue index 0e2ef91..fb7dfd0 100644 --- a/src/main/resources/static/components/msgNotify/msgNotify.vue +++ b/src/main/resources/static/components/msgNotify/msgNotify.vue @@ -181,6 +181,15 @@ +
+ + + + + +
搜索
@@ -272,6 +281,7 @@ module.exports = { pageForm1: { groupId: "", searchName: 'u.username', + isMember: 1, pageNumber: 1, pageSize: 5, totalCount: 0, @@ -467,4 +477,4 @@ module.exports = { } } } - \ No newline at end of file + diff --git a/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html b/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html index 90f00a5..a7d20e1 100644 --- a/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html +++ b/src/main/resources/views/platform/msgNotify/msgNotifyTitle.html @@ -205,7 +205,7 @@ layout("/layouts/platform.html"){ window.location.href = '/platform/msgNotify/send?notifyId=' + id + "&hold=" + hold }*/ const {id, hold} = row - window.location.href = '/platform/msgNotify/send?notifyId=' + id + "&hold=" + hold + window.location.href = '/platform/msgNotify/send?notifyId=' + id + "&hold=" + false }, openView(row) { const {id, hold} = row diff --git a/src/main/resources/views/platform/msgNotify/send.html b/src/main/resources/views/platform/msgNotify/send.html index 7a3da2a..19605aa 100644 --- a/src/main/resources/views/platform/msgNotify/send.html +++ b/src/main/resources/views/platform/msgNotify/send.html @@ -229,4 +229,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/lxy/HdTj.html b/src/main/resources/views/platform/zgfw/lxy/HdTj.html index 64bfb20..0ab8032 100644 --- a/src/main/resources/views/platform/zgfw/lxy/HdTj.html +++ b/src/main/resources/views/platform/zgfw/lxy/HdTj.html @@ -97,10 +97,11 @@ layout("/layouts/platform.html"){ + width="180px"> @@ -260,6 +261,21 @@ display: -webkit-box; } }, methods: { + async doDelete(row) { + const confirm = await this.$confirm('确定要删除该报名人员吗', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + if (confirm !== "confirm") return + const resp = await $.post('/platform/zgfw/lxy/hdtj/doDelete', {id:row.id}) + if (resp.code === 0) { + this.pageData() + this.$message.success(resp.msg) + } else { + this.$message.warning(resp.msg) + } + }, async confirmMsg(val) { const confirm = await this.$confirm('确定要给报名人员发送消息吗', '提示', { confirmButtonText: '确定',