commit
This commit is contained in:
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
package com.budwk.app.zhgh.club.controller.apply;
|
package com.budwk.app.zhgh.club.controller.apply;
|
||||||
|
|
||||||
|
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||||
import cn.dev33.satoken.annotation.SaMode;
|
import cn.dev33.satoken.annotation.SaMode;
|
||||||
import com.budwk.app.base.annotation.SLog;
|
import com.budwk.app.base.annotation.SLog;
|
||||||
@@ -113,7 +114,7 @@ public class ClubUserJoinMineController {
|
|||||||
|
|
||||||
@At
|
@At
|
||||||
@ApiOperation("申请详情")
|
@ApiOperation("申请详情")
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result info(@Valid String id) {
|
public Result info(@Valid String id) {
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
SELECT
|
SELECT
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class ClubCommonController {
|
|||||||
private SysRoleService sysRoleService;
|
private SysRoleService sysRoleService;
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result listClub() {
|
public Result listClub() {
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
SELECT
|
SELECT
|
||||||
|
|||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
package com.budwk.app.zhgh.club.controller.evaluate;
|
package com.budwk.app.zhgh.club.controller.evaluate;
|
||||||
|
|
||||||
|
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import cn.hutool.core.lang.Dict;
|
import cn.hutool.core.lang.Dict;
|
||||||
@@ -134,7 +135,7 @@ public class ClubEvaluateApplyController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getMyClubAndYearAuditPass(Integer year) {
|
public Result getMyClubAndYearAuditPass(Integer year) {
|
||||||
//List<NutMap> list = sysClubService.getMyClubAndYearAuditPass(year);
|
//List<NutMap> list = sysClubService.getMyClubAndYearAuditPass(year);
|
||||||
|
|
||||||
|
|||||||
+8
-7
@@ -1,5 +1,6 @@
|
|||||||
package com.budwk.app.zhgh.club.controller.examine;
|
package com.budwk.app.zhgh.club.controller.examine;
|
||||||
|
|
||||||
|
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import cn.hutool.core.lang.Dict;
|
import cn.hutool.core.lang.Dict;
|
||||||
@@ -65,7 +66,7 @@ public class ClubExamineApplyController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getCount(@Valid String id, @Valid Integer year) {
|
public Result getCount(@Valid String id, @Valid Integer year) {
|
||||||
List<SysClubExamineRegister> list = dao.query(SysClubExamineRegister.class, Cnd.where("clubId", "=", id).and("year(registerDate)", "=", year));
|
List<SysClubExamineRegister> list = dao.query(SysClubExamineRegister.class, Cnd.where("clubId", "=", id).and("year(registerDate)", "=", year));
|
||||||
List<ProcessInstance> instanceList = dao.query(
|
List<ProcessInstance> instanceList = dao.query(
|
||||||
@@ -77,28 +78,28 @@ public class ClubExamineApplyController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getClubsByRole() {
|
public Result getClubsByRole() {
|
||||||
List<SysClub> myManageClub = sysClubService.getMyManageClub();
|
List<SysClub> myManageClub = sysClubService.getMyManageClub();
|
||||||
return Result.success(myManageClub);
|
return Result.success(myManageClub);
|
||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getClubUserNum(@Valid String clubId) {
|
public Result getClubUserNum(@Valid String clubId) {
|
||||||
List<NutMap> result = sysClubExamineService.getClubUserNum(clubId);
|
List<NutMap> result = sysClubExamineService.getClubUserNum(clubId);
|
||||||
return Result.success(result);
|
return Result.success(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getJgUser(@Valid String clubId) {
|
public Result getJgUser(@Valid String clubId) {
|
||||||
List<NutMap> result = sysClubExamineService.getJgUser(clubId);
|
List<NutMap> result = sysClubExamineService.getJgUser(clubId);
|
||||||
return Result.success(result);
|
return Result.success(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getClubMemberMoney(@Valid String clubId) {
|
public Result getClubMemberMoney(@Valid String clubId) {
|
||||||
int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId));
|
int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId));
|
||||||
SysClub club = dao.fetch(SysClub.class, clubId);
|
SysClub club = dao.fetch(SysClub.class, clubId);
|
||||||
@@ -107,7 +108,7 @@ public class ClubExamineApplyController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getXghBkMoney(@Valid String clubId) {
|
public Result getXghBkMoney(@Valid String clubId) {
|
||||||
/*jf_club club = dao().fetch(jf_club.class, Cnd.where("club_id", "=", id));
|
/*jf_club club = dao().fetch(jf_club.class, Cnd.where("club_id", "=", id));
|
||||||
Double total_quota = Double.valueOf(club.getTotal_quota());*/
|
Double total_quota = Double.valueOf(club.getTotal_quota());*/
|
||||||
@@ -115,7 +116,7 @@ public class ClubExamineApplyController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result getLasYearSurplus(@Valid String clubId) {
|
public Result getLasYearSurplus(@Valid String clubId) {
|
||||||
SysClubExamineRegister register = dao.fetch(SysClubExamineRegister.class, Cnd.where("clubId", "=", clubId)
|
SysClubExamineRegister register = dao.fetch(SysClubExamineRegister.class, Cnd.where("clubId", "=", clubId)
|
||||||
.and("YEAR(registerDate)", "=", DateUtil.thisYear() - 1));
|
.and("YEAR(registerDate)", "=", DateUtil.thisYear() - 1));
|
||||||
|
|||||||
+4
-3
@@ -1,5 +1,6 @@
|
|||||||
package com.budwk.app.zhgh.club.controller.register;
|
package com.budwk.app.zhgh.club.controller.register;
|
||||||
|
|
||||||
|
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
@@ -150,7 +151,7 @@ public class ClubRegistApplyController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result queryUserByIds(@Valid String[] ids) {
|
public Result queryUserByIds(@Valid String[] ids) {
|
||||||
Cnd cnd = Cnd.NEW();
|
Cnd cnd = Cnd.NEW();
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
@@ -173,14 +174,14 @@ public class ClubRegistApplyController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result info(@Valid String id) {
|
public Result info(@Valid String id) {
|
||||||
ClubRegisterVo clubRegisterVo = sysClubService.findOne(id);
|
ClubRegisterVo clubRegisterVo = sysClubService.findOne(id);
|
||||||
return Result.success(clubRegisterVo);
|
return Result.success(clubRegisterVo);
|
||||||
}
|
}
|
||||||
|
|
||||||
@At
|
@At
|
||||||
@SaCheckPermission("club")
|
@SaCheckLogin
|
||||||
public Result createCode() {
|
public Result createCode() {
|
||||||
int count = sysClubService.count(Cnd.where("year(createTime)", "=", DateUtil.thisYear()));
|
int count = sysClubService.count(Cnd.where("year(createTime)", "=", DateUtil.thisYear()));
|
||||||
String s = String.format("%02d", count + 1);
|
String s = String.format("%02d", count + 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user