c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Paidax
2025-09-11 09:22:37 +08:00
parent d52504f438
commit af765b180f
17 changed files with 324 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java
+1
View File
@@ -92,6 +92,7 @@ public class MemberApplyBranchUnionApprovalController {
info.userState,
info.preparedBy,
info.personType,
info.applyDateTime,
info.sign,
ins.id AS instanceId,
ins.businessNo,
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java
+1
View File
@@ -91,6 +91,7 @@ public class MemberApplySchoolUnionApprovalController {
info.preparedBy,
info.personType,
info.origin,
info.applyDateTime,
info.sign,
ins.id AS instanceId,
ins.businessNo,
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java
+9 -8
View File
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.staffmanage.member.controller.info;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.date.DateUtil;
import com.budwk.app.base.result.Result;
import com.budwk.app.sys.models.Sys_dict;
@@ -46,7 +47,7 @@ public class MemberInfoBoardController {
}
@At
@Ok("beetl:/platform/zhghh5/staffmanage/member/board/index.html")
@Ok("beetl:/platform/zhghh5/staffmanage/member/info/board/index.html")
@SaCheckPermission("h5.member.info.board")
public void h5() {
}
@@ -55,7 +56,7 @@ public class MemberInfoBoardController {
* @return 今年和去年的会员数
*/
@At
@SaCheckPermission("member.info.board")
@SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR)
public Result memberNumber() {
int memberNum = memberInfoService.count(Sqls.create("select count(1) from sys_user where member = 1"));
int lastYearMemberNum = memberInfoService.count(Sqls.create("select count(1) from member_history where year = year(now()) -1 "));
@@ -66,7 +67,7 @@ public class MemberInfoBoardController {
* @return 会员增长趋势
*/
@At
@SaCheckPermission("member.info.board")
@SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR)
public Result growthTrend() {
List<Map> result = new ArrayList<>();
int year = DateUtil.thisYear();
@@ -83,7 +84,7 @@ public class MemberInfoBoardController {
* @return 会员占比
*/
@At
@SaCheckPermission("member.info.board")
@SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR)
public Result memberPercentage() {
List<Sys_dict> memberApplyPersonTypeDictList = sysDictService.getSubListByCode("PERSON_TYPE");
List<String> personTypes = memberApplyPersonTypeDictList.stream().map(Sys_dict::getCode).collect(Collectors.toList());
@@ -103,7 +104,7 @@ public class MemberInfoBoardController {
* @return 男女占比
*/
@At
@SaCheckPermission("member.info.board")
@SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR)
public Result memberSexPercentage() {
int men = memberInfoService.count(Sqls.create("select count(1) from sys_user where member = 1 and sex = '男' "));
int women = memberInfoService.count(Sqls.create("select count(1) from sys_user where member = 1 and sex = '女' "));
@@ -117,7 +118,7 @@ public class MemberInfoBoardController {
* @return
*/
@At
@SaCheckPermission("member.info.board")
@SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR)
public Result unionMember() {
String str = """
SELECT
@@ -141,7 +142,7 @@ public class MemberInfoBoardController {
* @return
*/
@At
@SaCheckPermission("member.info.board")
@SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR)
public Result personTypeMember() {
Sql sql = Sqls.create("""
SELECT
@@ -166,7 +167,7 @@ public class MemberInfoBoardController {
* @return
*/
@At
@SaCheckPermission("member.info.board")
@SaCheckPermission(value = {"member.info.board", "h5.member.info.board"}, mode = SaMode.OR)
public Object userStateMember() {
Sql sql = Sqls.create("""
SELECT
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoGroupController.java
+12 -6
View File
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.staffmanage.member.controller.info;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.DesensitizedUtil;
import com.alibaba.excel.EasyExcel;
import com.budwk.app.base.annotation.SLog;
@@ -39,10 +40,10 @@ import java.util.List;
* @Date 2024/8/8 10:06
* @注释 会员档案管理
*/
@At("/platform/member/info/group")
@Ok("json:full")
@IocBean
@Slf4j
@IocBean
@Ok("json:full")
@At("/platform/member/info/group")
public class MemberInfoGroupController {
@Inject
@@ -54,11 +55,16 @@ public class MemberInfoGroupController {
public void index() {
}
@At
@Ok("beetl:/platform/zhghh5/staffmanage/member/info/group/index.html")
@SaCheckPermission("h5.member.info.group")
public void h5() {
}
@At
@SaCheckPermission("member.info.group")
@SaCheckPermission(value = {"member.info.group", "h5.member.info.group"}, mode = SaMode.OR)
@Ok("json:{dateFormat:'yyyy-MM-dd'}")
public Result pageData(@Valid @Param("pageForm") MemberInfoPageForm pageForm) {
public Result pageData(MemberInfoPageForm pageForm) {
Sql sql = memberInfoService.getSql(pageForm);
Pagination<NutMap> pagination = memberInfoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
for (NutMap row : pagination.getList()) {
@@ -78,7 +84,7 @@ public class MemberInfoGroupController {
@At
@SaCheckPermission("member.info.group")
@Aop(TransAop.READ_COMMITTED)
@SLog(type = "memberInfoGroup", tag = "备份会员数据", msg = "备份会员数据")
@SLog(tag = "备份会员数据", msg = "备份会员数据")
public Result archive(@Valid Integer year) {
try {
memberInfoService.archiveMember(year);
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/modelworker/MemberModelWorkerController.java
-91
View File
@@ -1,91 +0,0 @@
package com.budwk.app.zhgh.staffmanage.member.controller.modelworker;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberModelWorkerPageForm;
import com.budwk.app.zhgh.staffmanage.member.service.MemberModelWorkerService;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @version 1.0
* @Author zzr
* @name：MemberModelWorkerController
* @Date 2024/9/25 14:24
* @注释
*/
@Slf4j
@IocBean
@Ok("json")
@At("/platform/member/modelWorker/manage")
public class MemberModelWorkerController {
@Inject
private MemberModelWorkerService memberModelWorkerService;
@At("")
@Ok("beetl:/platform/zhgh/staffmanage/member/modelworker/manage/index.html")
@SaCheckPermission("member.modelWorker.manage")
public void index() {}
@At
@SaCheckPermission("member.modelWorker.manage")
public Result pageData(MemberModelWorkerPageForm pageForm) {
Sql sql = memberModelWorkerService.getSql(pageForm);
Pagination pagination = memberModelWorkerService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
}
@At
@SaCheckPermission("member.modelWorker.manage")
public Result setModelWorker(String userId) {
if (StrUtil.isNotBlank(userId)) {
memberModelWorkerService.update(Chain.make("isModelWorker", true), Cnd.where("id", "=", userId));
return Result.success();
} else {
return Result.error();
}
}
/**
* 取消劳模身份
* @return
*/
@At
@SaCheckPermission(value = {"member.modelWorker.manage","member.branchUnion.manage.list","member.schoolUnion.manage.list"}, mode = SaMode.OR)
public Result cancelModelWorker(@Param("userIds") String[] userIds) {
List<String> list = Arrays.asList(userIds);
if (Lang.isNotEmpty(list)) {
memberModelWorkerService.update(Chain.make("isModelWorker", false), Cnd.where("id", "in", list));
return Result.success();
} else {
return Result.error();
}
}
@At
@Ok("void")
@SaCheckPermission("member.modelWorker.manage")
public void doExport(MemberModelWorkerPageForm pageForm, HttpServletResponse response){
memberModelWorkerService.doExport(pageForm, response);
}
}
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java
-6
View File
@@ -43,12 +43,6 @@ public class MemberComprehensiveController {
public void index() {
}
@At
@Ok("beetl:/platform/zhghh5/staffmanage/member/query/index.html")
@SaCheckPermission("h5.member.query")
public void h5() {
}
@At
@SaCheckPermission("member.statistics.comprehensive")
public Result pageData(MemberStatisticsPageForm pageForm) {