commit

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java

@@ -4,14 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.wizzer.framework.page.Pagination;
 import io.v.nutz.base.annontation.ViReturn;
+import io.v.nutz.base.utils.MsgApi;
 import io.v.nutz.base.utils.Roles;
 import io.v.nutz.base.model.Audit;
 import io.v.nutz.base.query.PageForm;
 import io.v.nutz.sys.constant.club.ClubRegistAuditState;
-import io.v.nutz.sys.models.Sys_club;
+import io.v.nutz.sys.models.*;
-import io.v.nutz.sys.models.Sys_club_user;
-import io.v.nutz.sys.models.Sys_file;
-import io.v.nutz.sys.models.Sys_user_role;
 import io.v.nutz.sys.services.SysClubService;
 import io.v.nutz.sys.services.SysRoleService;
 import io.v.nutz.sys.services.SysUserService;
@@ -44,15 +42,14 @@ public class ClubXghReplyController {
 
     @Inject
     private SysClubService sysClubService;
-
     @Inject
     private SysUserService sysUserService;
-
     @Inject
     private SysRoleService sysRoleService;
-
     @Inject
     private Dao dao;
+    @Inject
+    private MsgApi msgApi;
 
     @At("")
     @Ok("beetl:/platform/sys/club/regist/xghReply.html")
@@ -99,7 +96,7 @@ public class ClubXghReplyController {
             dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId)
                     .and("roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)));
         } else {
-            club.setState(ClubRegistAuditState.ST_CONFIRM);
+            club.setState(ClubRegistAuditState.SCHOOL_PASS);
             //审核通过加角色
             List<Sys_user_role> userRoles = new ArrayList<>();
             List<Sys_club_user> sysClubUsers = dao.query(Sys_club_user.class,
@@ -115,6 +112,15 @@ public class ClubXghReplyController {
             sysUserService.clearCache();
             sysRoleService.clearCache();
             club.setFoundTime(StrUtil.blankToDefault(sys_club.getFoundTime(), DateUtil.now()));
+
+            //校工会审核通过发短信给会长
+            Sys_club_user sysClubUser = sysClubUsers.stream().filter(o -> o.getSf() == 1).findFirst().orElse(null);
+            if(sysClubUser != null) {
+                Sys_user sysUser = dao.fetch(Sys_user.class, sysClubUser.getUserid());
+                String content = "%s老师您好，您申请注册的%s已经审核通过。".formatted(sysUser.getUsername(), club.getName());
+                String link = "";
+                msgApi.sendMsg(List.of("DingTalk"), sysUser.getLoginname(), 2, "协会注册", content, "", link);
+            }
         }
         club.setXghAuditId(audit.getId());
         dao.updateIgnoreNull(club);

src/main/resources/static/components/club/clubRegistInfo.vue

@@ -136,13 +136,13 @@
       <vi-title title="审核信息"></vi-title>
       <el-descriptions :column="2" border class="table_fixed">
         <el-descriptions-item label="审核人员">
-          {{ viewData.unitPartAudit.username }}
+          {{ viewData.unitPartAudit?.username }}
         </el-descriptions-item>
         <el-descriptions-item label="审核时间">
-          {{ viewData.unitPartAudit.auditTime }}
+          {{ viewData.unitPartAudit?.auditTime }}
         </el-descriptions-item>
         <el-descriptions-item :span="2" label="审核意见">
-          {{ viewData.unitPartAudit.auditOpinion }}
+          {{ viewData.unitPartAudit?.auditOpinion }}
         </el-descriptions-item>
       </el-descriptions>
     </el-tab-pane>
@@ -151,13 +151,13 @@
       <vi-title title="审核信息"></vi-title>
       <el-descriptions :column="2" border class="table_fixed">
         <el-descriptions-item label="审核人员">
-          {{ viewData.xtAudit.username }}
+          {{ viewData.xtAudit?.username }}
         </el-descriptions-item>
         <el-descriptions-item label="审核时间">
-          {{ viewData.xtAudit.auditTime }}
+          {{ viewData.xtAudit?.auditTime }}
         </el-descriptions-item>
         <el-descriptions-item :span="2" label="审核意见">
-          {{ viewData.xtAudit.auditOpinion }}
+          {{ viewData.xtAudit?.auditOpinion }}
         </el-descriptions-item>
         <el-descriptions-item label="审核附件">
           <file-upload v-if="viewData.schoolReplyFile && viewData.schoolReplyFile.length > 0"
@@ -171,13 +171,13 @@
       <vi-title title="审核信息"></vi-title>
       <el-descriptions :column="2" border class="table_fixed">
         <el-descriptions-item label="审核人员">
-          {{ viewData.xldAudit.username }}
+          {{ viewData.xldAudit?.username }}
         </el-descriptions-item>
         <el-descriptions-item label="审核时间">
-          {{ viewData.xldAudit.auditTime }}
+          {{ viewData.xldAudit?.auditTime }}
         </el-descriptions-item>
         <el-descriptions-item :span="2" label="审核意见">
-          {{ viewData.xldAudit.auditOpinion }}
+          {{ viewData.xldAudit?.auditOpinion }}
         </el-descriptions-item>
       </el-descriptions>
     </el-tab-pane>
@@ -186,13 +186,13 @@
       <vi-title title="审核信息"></vi-title>
       <el-descriptions :column="2" border class="table_fixed">
         <el-descriptions-item label="审核人员">
-          {{ viewData.xghAudit.username }}
+          {{ viewData.xghAudit?.username }}
         </el-descriptions-item>
         <el-descriptions-item label="审核时间">
-          {{ viewData.xghAudit.auditTime }}
+          {{ viewData.xghAudit?.auditTime }}
         </el-descriptions-item>
         <el-descriptions-item label="审核意见">
-          {{ viewData.xghAudit.auditOpinion }}
+          {{ viewData.xghAudit?.auditOpinion }}
         </el-descriptions-item>
         <el-descriptions-item label="成立时间">
           {{ viewData.foundTime }}

src/main/resources/views/platform/sys/club/regist/xghReply.html

@@ -78,7 +78,7 @@ layout("/layouts/platform.html"){
                     <template scope="{row}">
                         <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
                         <el-button v-if="[870].includes(row.state)" @click="openAudit(row)" size="mini" type="primary">审核</el-button>
-                        <el-button v-if="[880, 890, 900].includes(row.state)" @click="rollback(row)" size="mini" type="primary">撤回</el-button>
+                        <el-button v-if="[880, 890, 930].includes(row.state)" @click="rollback(row)" size="mini" type="primary">撤回</el-button>
                     </template>
                 </el-table-column>
             </el-table>