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:
@jyuhsin
2025-09-23 17:30:54 +08:00
parent e2e5de203a
commit 6243a033eb
64 changed files with 3696 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/family/constant/ColumnFormTypeEnum.java
+1
View File
@@ -16,6 +16,7 @@ public enum ColumnFormTypeEnum {
INPUT("INPUT", "输入框"),
SELECT("SELECT", "选择框"),
STEPPER("STEPPER", "步进器"),
//RADIO("RADIO", "单选框"),//选项数组
FILE("FILE", "文件");
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/constant/ColumnFormTypeEnum.java
+1
View File
@@ -16,6 +16,7 @@ public enum ColumnFormTypeEnum {
INPUT("INPUT", "输入框"),
SELECT("SELECT", "选择框"),
STEPPER("STEPPER", "步进器"),
//RADIO("RADIO", "单选框"),//选项数组
FILE("FILE", "文件");
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpAdjustController.java
+9 -9
View File
@@ -36,7 +36,7 @@ import java.util.List;
@IocBean
@Ok("json:full")
@Api(tags = "品牌活动人员调整")
@At("/platform/trainSingUp/adjust")
@At("/platform/trainSignUp/adjust")
public class TrainSignUpAdjustController {
@Inject
@@ -49,8 +49,8 @@ public class TrainSignUpAdjustController {
private TrainSignUpActivityStatisticsService trainSignUpActivityStatisticsService;
@At("")
@SaCheckPermission("trainSingUp.adjust")
@Ok("beetl:/platform/zhgh/activity/trainSingUp/userAdjust/index.html")
@SaCheckPermission("trainSignUp.adjust")
@Ok("beetl:/platform/zhgh/activity/trainSignUp/userAdjust/index.html")
public void index() {
}
@@ -61,7 +61,7 @@ public class TrainSignUpAdjustController {
*/
@At
@ApiOperation("活动列表")
@SaCheckPermission("trainSingUp.adjust")
@SaCheckPermission("trainSignUp.adjust")
public Result activityList(@Param(value = "year") Integer year) {
List<TrainSignUpActivity> activityList = dao.query(TrainSignUpActivity.class, Cnd.NEW().andEX("year", "=", year).andEX("isDisabled", "=", false).desc("activityStartTime"));
return Result.success(activityList);
@@ -69,7 +69,7 @@ public class TrainSignUpAdjustController {
@At
@ApiOperation("分页查询")
@SaCheckPermission("trainSingUp.adjust")
@SaCheckPermission("trainSignUp.adjust")
public Result pageData(PageForm pageForm,
@Param(value = "activityId") String activityId) {
Pagination pagination = trainSignUpActivityStatisticsService.pageData(pageForm, activityId);
@@ -78,7 +78,7 @@ public class TrainSignUpAdjustController {
@At
@ApiOperation("子活动查询")
@SaCheckPermission("trainSingUp.adjust")
@SaCheckPermission("trainSignUp.adjust")
public Result getCourse(String activityId) {
Sql sql = Sqls.create("""
SELECT
@@ -108,7 +108,7 @@ public class TrainSignUpAdjustController {
@At
@ApiOperation("报名用户列表")
@SaCheckPermission("trainSingUp.adjust")
@SaCheckPermission("trainSignUp.adjust")
public Result registerUserList(@Param("courseId") String courseId,
@Param(value = "unionId") String unionId,
@Param(value = "unitId") String unitId,
@@ -120,7 +120,7 @@ public class TrainSignUpAdjustController {
@At
@ApiOperation("人员调整")
@SaCheckPermission("trainSingUp.adjust")
@SaCheckPermission("trainSignUp.adjust")
@SLog(tag = "品牌活动-人员调整", msg = "人员调整")
public Result adjust(String activityId, String oldCourseId, String newCourseId, String userId) {
@@ -159,7 +159,7 @@ public class TrainSignUpAdjustController {
@At
@ApiOperation("删除报名人员")
@SaCheckPermission("trainSingUp.adjust")
@SaCheckPermission("trainSignUp.adjust")
@SLog(tag = "品牌活动-人员调整", msg = "删除报名人员")
public Result deleteSignUser(String activityId, String courseId, String userId) {
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java
+16 -18
View File
@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
@IocBean
@Ok("json:full")
@Api(tags = "活动报名")
@At("/platform/trainSingUp/apply")
@At("/platform/trainSignUp/apply")
public class TrainSignUpApplyController {
private final ReentrantLock lock = new ReentrantLock(true);
@@ -60,26 +60,26 @@ public class TrainSignUpApplyController {
private Dao dao;
@At("/")
@SaCheckPermission("trainSingUp.apply")
@Ok("beetl:/platform/zhgh/activity/trainSingUp/apply/index.html")
@SaCheckPermission("trainSignUp.apply")
@Ok("beetl:/platform/zhgh/activity/trainSignUp/apply/index.html")
public void index() {
}
@At("/h5")
@SaCheckPermission("h5.trainSingUp.apply")
@SaCheckPermission("h5.trainSignUp.apply")
@Ok("beetl:/platform/zhghh5/activity/trainSignUp/apply/index.html")
public void h5Index() {
}
@At("/list/h5")
@SaCheckPermission("h5.trainSingUp.apply")
@SaCheckPermission("h5.trainSignUp.apply")
@Ok("beetl:/platform/zhghh5/activity/trainSignUp/list/index.html")
public void listIndex() {
}
@At
@ApiOperation("活动查询")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
public Result activityPageData(PageForm pageForm,
@Param(value = "year") Integer year,
@Param(value = "activityType") Integer activityType,
@@ -90,12 +90,10 @@ public class TrainSignUpApplyController {
cnd.andEX("`year`", "=", year);
//查询报名中
if (activityType == 2) {
cnd.and(new Static("now() > activitySignUpStartTime and now() < activitySignUpEndTime"));
cnd.and(new Static("now() < activitySignUpEndTime"));
}//查询已结束的
else if (activityType == 3) {
cnd.and(new Static("now() > activitySignUpEndTime"));
} else if (activityType == 4) {
cnd.and(new Static("now() < activitySignUpStartTime"));
cnd.and(new Static("now() >= activityEndTime"));
}
if (AuthUtil.hasRole("H04") && !AuthUtil.hasRoleOr("sysadmin, A06")) {
@@ -115,7 +113,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("分活动查询")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
public Result pageData(PageForm pageForm,
@Param(value = "courseTypeId") String courseTypeId,
@Param(value = "activityId") String activityId,
@@ -196,7 +194,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("获取分活动时间")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
public Result getCourseTime(String id) {
List<TrainSignUpActivityCourse> list = trainSignUpActivityService.dao().query(TrainSignUpActivityCourse.class, Cnd.where("courseId", "=", id));
return Result.success(list);
@@ -204,7 +202,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("查询分类标识集合")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
public Result queryCourseAssort(String activityId) {
List<TrainSignUpCourse> courseList = trainSignUpActivityService.dao().query(TrainSignUpCourse.class, Cnd.where(TrainSignUpCourse::getActivityId, "=", activityId).asc(TrainSignUpCourse::getOrderNum));
if (Lang.isEmpty(courseList)) {
@@ -216,7 +214,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("验证是否能报名")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
public Result validateSignUp(String courseId,
@Param(value = "currentFamilyNumber") Integer currentFamilyNumber) {
try {
@@ -282,7 +280,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("查询子活动时间段")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
public Result getCourseTimeSelectList(String courseId) {
// 查课程的时间段
List<TrainSignUpActivityCourse> courseList = dao.query(TrainSignUpActivityCourse.class, Cnd.where("courseId", "=", courseId).asc("courseStartTime"));
@@ -316,7 +314,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("验证子活动是否能报名")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
public Result validateSourceSignUp(String activityCourseId, String courseId) {
try {
lock.lock();
@@ -346,7 +344,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("活动报名")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
@SLog(tag = "品牌活动-活动报名", msg = "活动报名")
public Result doSignUp(TrainSignUpUser trainSignUpUser) {
try {
@@ -386,7 +384,7 @@ public class TrainSignUpApplyController {
@At
@ApiOperation("取消报名")
@SaCheckPermission(value = {"trainSingUp.apply", "h5.trainSingUp.apply"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.apply", "h5.trainSignUp.apply"}, mode = SaMode.OR)
@SLog(tag = "品牌活动-活动报名", msg = "取消报名")
public Result cancelSignUp(@Param("activityId") String activityId, @Param("courseId") String courseId) {
String userId = SecurityUtil.getUserId();
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java
+11 -11
View File
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
@IocBean
@Ok("json:full")
@Api(tags = "活动管理")
@At("/platform/trainSingUp/manage")
@At("/platform/trainSignUp/manage")
public class TrainSignUpManageController {
@Inject
@@ -49,14 +49,14 @@ public class TrainSignUpManageController {
private Dao dao;
@At("")
@SaCheckPermission("trainSingUp.manage")
@Ok("beetl:/platform/zhgh/activity/trainSingUp/manage/index.html")
@SaCheckPermission("trainSignUp.manage")
@Ok("beetl:/platform/zhgh/activity/trainSignUp/manage/index.html")
public void index() {
}
@At
@ApiOperation("分页查询")
@SaCheckPermission("trainSingUp.manage")
@SaCheckPermission("trainSignUp.manage")
public Result pageData(PageForm pageForm,
@Param(value = "year") Integer year,
@Param(value = "activityName") String activityName) {
@@ -69,7 +69,7 @@ public class TrainSignUpManageController {
@At
@ApiOperation("活动删除")
@SaCheckPermission("trainSingUp.manage")
@SaCheckPermission("trainSignUp.manage")
@SLog(tag = "品牌活动-活动管理", msg = "删除活动")
public Result onDelete(String id) {
Trans.exec(() -> {
@@ -87,7 +87,7 @@ public class TrainSignUpManageController {
@At
@ApiOperation("活动状态变更")
@SaCheckPermission("trainSingUp.manage")
@SaCheckPermission("trainSignUp.manage")
public Result activityStatusChange(TrainSignUpActivity activity) {
trainSignUpActivityManageService.updateActivityStatus(activity);
dao.update(Sys_home_activity.class,
@@ -98,7 +98,7 @@ public class TrainSignUpManageController {
@At
@ApiOperation("查询单个活动")
@SaCheckPermission("trainSingUp")
@SaCheckPermission("trainSignUp")
public Result findOne(@Param("id") @NotNull String id) {
NutMap dataMap = trainSignUpActivityManageService.findOne(id, null, "");
String activityStartTime = dataMap.getString("activityStartTime");
@@ -146,7 +146,7 @@ public class TrainSignUpManageController {
@At
@Ok("json:full")
@ApiOperation("品牌活动新增/修改")
@SaCheckPermission("trainSingUp.manage")
@SaCheckPermission("trainSignUp.manage")
@SLog(tag = "品牌活动-活动管理", msg = "新增/修改活动")
public Result doHandle(TrainSignUpActivity activity) {
if (StrUtil.isBlank(activity.getId())) {
@@ -160,7 +160,7 @@ public class TrainSignUpManageController {
@At
@Ok("json:full")
@ApiOperation("获取分工会人数限制")
@SaCheckPermission("trainSingUp.manage")
@SaCheckPermission("trainSignUp.manage")
public Result getUnionLimit(@Param(value = "activityScopeId") String activityScopeId) {
Sql sql = Sqls.create("""
SELECT
@@ -184,7 +184,7 @@ public class TrainSignUpManageController {
@At
@Ok("json:full")
@ApiOperation("获取报名人员数量")
@SaCheckPermission("trainSingUp.manage")
@SaCheckPermission("trainSignUp.manage")
public Result getRegisterUserCount(@Param(value = "courseId") String courseId) {
return Result.success().addData(dao.count(TrainSignUpUser.class, Cnd.where("courseId", "=", courseId)));
}
@@ -192,7 +192,7 @@ public class TrainSignUpManageController {
@At
@Ok("json:full")
@ApiOperation("获取历史活动列表")
@SaCheckPermission("trainSingUp.manage")
@SaCheckPermission("trainSignUp.manage")
public Result getHistoricalActList() {
List<TrainSignUpActivity> query = dao.query(TrainSignUpActivity.class, Cnd.NEW().desc("activityStartTime"));
return Result.success().addData(query);
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpTypeController.java
+9 -9
View File
@@ -42,7 +42,7 @@ import java.util.List;
@IocBean
@Ok("json:full")
@Api(tags = "活动类型管理")
@At("/platform/trainSingUp/type")
@At("/platform/trainSignUp/type")
public class TrainSignUpTypeController {
@Inject
@@ -51,14 +51,14 @@ public class TrainSignUpTypeController {
private BaseService baseService;
@At("")
@SaCheckPermission("trainSingUp.type")
@Ok("beetl:/platform/zhgh/activity/trainSingUp/type/index.html")
@SaCheckPermission("trainSignUp.type")
@Ok("beetl:/platform/zhgh/activity/trainSignUp/type/index.html")
public void index() {
}
@At
@ApiOperation("分页查询")
@SaCheckPermission("trainSingUp.type")
@SaCheckPermission("trainSignUp.type")
public Result pageData(PageForm pageForm,
@Param(value = "typeName") String typeName) {
Cnd cnd = Cnd.NEW();
@@ -89,7 +89,7 @@ public class TrainSignUpTypeController {
@At
@ApiOperation("活动类型新增")
@SaCheckPermission("trainSingUp.type")
@SaCheckPermission("trainSignUp.type")
@SLog(tag = "品牌活动-类型管理", msg = "活动类型新增")
public Result doAdd(@Param("data") String data) throws Exception {
TrainSignUpType type = Json.fromJson(TrainSignUpType.class, data);
@@ -105,7 +105,7 @@ public class TrainSignUpTypeController {
@At
@ApiOperation("活动类型修改")
@SaCheckPermission("trainSingUp.type")
@SaCheckPermission("trainSignUp.type")
@SLog(tag = "品牌活动-类型管理", msg = "活动类型修改")
public Result doEdit(TrainSignUpType type) {
int count = dao.count(TrainSignUpType.class, Cnd.where("code", "=", type.getCode()).and("id", "!=", type.getId()));
@@ -120,7 +120,7 @@ public class TrainSignUpTypeController {
@At
@ApiOperation("活动类型删除")
@SaCheckPermission("trainSingUp.type")
@SaCheckPermission("trainSignUp.type")
@SLog(tag = "品牌活动-类型管理", msg = "活动类型删除")
public Object doDelete(@Param(value = "id") String id) {
dao.clear(TrainSignUpType.class, Cnd.where("id", "=", id));
@@ -131,7 +131,7 @@ public class TrainSignUpTypeController {
@At
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("排序号变更")
@SaCheckPermission("trainSingUp.type")
@SaCheckPermission("trainSignUp.type")
public Object xhChange(String id, Integer xh, boolean toDown) {
if (toDown) {
TrainSignUpType next = dao.fetch(TrainSignUpType.class, Cnd.where("xh", "=", xh + 1));
@@ -158,7 +158,7 @@ public class TrainSignUpTypeController {
@At
@ApiOperation("自定义表单字段类型")
@SaCheckPermission("trainSingUp.type")
@SaCheckPermission("trainSignUp.type")
public Result getColumnType() {
List<String> names = EnumUtil.getNames(ColType.class);
names.add("JSON");
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserManageController.java
+10 -10
View File
@@ -44,8 +44,8 @@ import java.util.stream.Collectors;
*/
@IocBean
@Ok("json:full")
@Api(tags = "亲子活动人员黑名单")
@At("/platform/trainSingUp/userManage")
@Api(tags = "品牌活动人员黑名单")
@At("/platform/trainSignUp/userManage")
public class TrainSignUpUserManageController {
@Inject
@@ -54,14 +54,14 @@ public class TrainSignUpUserManageController {
private TrainSignUpBlackListService trainSignUpBlackListService;
@At("")
@SaCheckPermission("trainSingUp.userManage")
@Ok("beetl:/platform/zhgh/activity/trainSingUp/userManage/index.html")
@SaCheckPermission("trainSignUp.userManage")
@Ok("beetl:/platform/zhgh/activity/trainSignUp/userManage/index.html")
public void index() {
}
@At
@ApiOperation("分页查询")
@SaCheckPermission("trainSingUp.userManage")
@SaCheckPermission("trainSignUp.userManage")
public Result pageData(PageForm pageForm,
@Param(value = "activityId") String activityId,
@Param(value = "courseId") String courseId,
@@ -85,7 +85,7 @@ public class TrainSignUpUserManageController {
@At
@ApiOperation("报名人员处理")
@SaCheckPermission("trainSingUp.userManage")
@SaCheckPermission("trainSignUp.userManage")
@SLog(tag = "品牌活动-人员管理", msg = "报名人员处理")
public Result doHandleUser(@Param("userId") String userId) {
trainSignUpBlackListService.doHandleUser(userId);
@@ -94,7 +94,7 @@ public class TrainSignUpUserManageController {
@At
@ApiOperation("根据活动Id获取子活动")
@SaCheckPermission("trainSingUp.userManage")
@SaCheckPermission("trainSignUp.userManage")
public Result getCourseByActivityId(@Param("activityId") String activityId) {
List<TrainSignUpCourse> list = dao.query(TrainSignUpCourse.class, Cnd.where("activityId", "=", activityId));
return Result.success(list);
@@ -102,7 +102,7 @@ public class TrainSignUpUserManageController {
@At
@ApiOperation("获取子活动具体时间")
@SaCheckPermission("trainSingUp.userManage")
@SaCheckPermission("trainSignUp.userManage")
public Result attendClassRecord(String userId) {
trainSignUpBlackListService.attendClassRecord(userId);
return Result.success();
@@ -110,7 +110,7 @@ public class TrainSignUpUserManageController {
@At
@ApiOperation("获取候补人员")
@SaCheckPermission("trainSingUp.userManage")
@SaCheckPermission("trainSignUp.userManage")
public Result getReserveUser(String courseId) {
Sql sql = Sqls.create("""
SELECT
@@ -131,7 +131,7 @@ public class TrainSignUpUserManageController {
@At
@ApiOperation("补充人员")
@SaCheckPermission("trainSingUp.userManage")
@SaCheckPermission("trainSignUp.userManage")
@SLog(tag = "品牌活动-人员管理", msg = "补充人员")
public Result reserveSingUp(String[] ids, String courseId) {
//先查询这个课程有多少个未签到的人员
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainsignUpMineController.java
+8 -8
View File
@@ -40,7 +40,7 @@ import java.util.List;
@IocBean
@Ok("json:full")
@Api(tags = "活动报名")
@At("/platform/trainSingUp/mine")
@At("/platform/trainSignUp/mine")
public class TrainsignUpMineController {
@Inject
@@ -49,13 +49,13 @@ public class TrainsignUpMineController {
private TrainSignUpActivityService activityService;
@At("/")
@SaCheckPermission("trainSingUp.mine")
@Ok("beetl:/platform/zhgh/activity/trainSingUp/mine/index.html")
@SaCheckPermission("trainSignUp.mine")
@Ok("beetl:/platform/zhgh/activity/trainSignUp/mine/index.html")
public void index() {
}
@At("/h5")
@SaCheckPermission("h5.trainSingUp.mine")
@SaCheckPermission("h5.trainSignUp.mine")
@Ok("beetl:/platform/zhghh5/activity/trainSignUp/mine/index.html")
public void h5Index() {
}
@@ -63,7 +63,7 @@ public class TrainsignUpMineController {
@At
@ApiOperation("主动扫码签到")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission(value = {"trainSingUp.mine", "h5.trainSingUp.mine"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.mine", "h5.trainSignUp.mine"}, mode = SaMode.OR)
@SLog(tag = "品牌活动-活动签到", msg = "主动扫码签到")
public Result drivingScan(String courseId) {
@@ -96,7 +96,7 @@ public class TrainsignUpMineController {
@At
@ApiOperation("被动扫码签到")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission(value = {"trainSingUp.mine", "h5.trainSingUp.mine"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.mine", "h5.trainSignUp.mine"}, mode = SaMode.OR)
@SLog(tag = "品牌活动-活动签到", msg = "被动扫码签到")
public Result passiveScan(String id) {
@@ -124,7 +124,7 @@ public class TrainsignUpMineController {
@At
@ApiOperation("分活动查询")
@SaCheckPermission(value = {"trainSingUp.mine", "h5.trainSingUp.mine"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.mine", "h5.trainSignUp.mine"}, mode = SaMode.OR)
public Result queryCourseSign(String courseId) {
Sql sql = Sqls.create("""
SELECT
@@ -143,7 +143,7 @@ public class TrainsignUpMineController {
@At
@ApiOperation("获取我报名的课程")
@SaCheckPermission(value = {"trainSingUp.mine", "h5.trainSingUp.mine"}, mode = SaMode.OR)
@SaCheckPermission(value = {"trainSignUp.mine", "h5.trainSignUp.mine"}, mode = SaMode.OR)
public Result queryMineCourse(String activityId) {
Sql sql = Sqls.create("""
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java
+10 -10
View File
@@ -60,7 +60,7 @@ import java.util.zip.ZipOutputStream;
@IocBean
@Ok("json:full")
@Api(tags = "品牌活动统计")
@At("/platform/trainSingUp/statistics")
@At("/platform/trainSignUp/statistics")
public class TrainSignUpActivityStatisticsController {
@Inject
@@ -71,14 +71,14 @@ public class TrainSignUpActivityStatisticsController {
private Dao dao;
@At("")
@SaCheckPermission("trainSingUp.statistics")
@Ok("beetl:/platform/zhgh/activity/trainSingUp/statistics/index.html")
@SaCheckPermission("trainSignUp.statistics")
@Ok("beetl:/platform/zhgh/activity/trainSignUp/statistics/index.html")
public void index() {
}
@At
@ApiOperation("分页查询")
@SaCheckPermission("trainSingUp.statistics")
@SaCheckPermission("trainSignUp.statistics")
public Result pageData(PageForm pageForm,
@Param(value = "activityId") String activityId) {
Pagination pagination = trainSignUpActivityStatisticsService.pageData(pageForm, activityId);
@@ -93,7 +93,7 @@ public class TrainSignUpActivityStatisticsController {
*/
@At
@ApiOperation("活动列表")
@SaCheckPermission("trainSingUp.statistics")
@SaCheckPermission("trainSignUp.statistics")
public Result activityList(@Param(value = "year") Integer year) {
List<TrainSignUpActivity> list = dao.query(TrainSignUpActivity.class, Cnd.NEW().andEX("year", "=", year).desc("activityStartTime"));
return Result.success(list);
@@ -107,14 +107,14 @@ public class TrainSignUpActivityStatisticsController {
*/
@At
@ApiOperation("报名人员列表")
@SaCheckPermission("trainSingUp.statistics")
@SaCheckPermission("trainSignUp.statistics")
public Result registerUserList(@Param(value = "courseId") String courseId) {
return Result.success(trainSignUpActivityStatisticsService.registerUserList(courseId));
}
@At
@ApiOperation("报名动态列")
@SaCheckPermission("trainSingUp.statistics")
@SaCheckPermission("trainSignUp.statistics")
public Object getTaleColumnInfo(@Param(value = "courseId") String courseId) {
return Result.success(trainSignUpActivityStatisticsService.getTaleColumnInfo(courseId));
}
@@ -127,14 +127,14 @@ public class TrainSignUpActivityStatisticsController {
*/
@At
@ApiOperation("获取签到信息")
@SaCheckPermission("trainSingUp.statistics")
@SaCheckPermission("trainSignUp.statistics")
public Result getSignInfo(@Param("courseId") String courseId) {
return Result.success(trainSignUpActivityStatisticsService.getSignInfo(courseId));
}
@At
@ApiOperation("开放报名")
@SaCheckPermission("trainSingUp.statistics")
@SaCheckPermission("trainSignUp.statistics")
public Result signChange(@Param("courseId") String courseId, @Param("openOtherUnion") Boolean openOtherUnion) {
dao.update(TrainSignUpCourse.class, Chain.make("openOtherUnion", openOtherUnion)
, Cnd.where("id", "=", courseId));
@@ -144,7 +144,7 @@ public class TrainSignUpActivityStatisticsController {
@At
@Ok("void")
@ApiOperation("导出签到名单")
@SaCheckPermission("trainSingUp.statistics")
@SaCheckPermission("trainSignUp.statistics")
public void exportSignUser(@Param(value = "activityId") String activityId,
HttpServletResponse response) throws IOException {
try {
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainMobileSignColumn.java
+6 -1
View File
@@ -1,13 +1,18 @@
package com.budwk.app.zhgh.activity.trainSignUp.models;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
import java.util.List;
@Table("train_mobile_sign_column")
@Data
@Accessors(chain = true)
@Comment("品牌活动移动端动态表单")
@Table("train_mobile_sign_column")
@EqualsAndHashCode(callSuper = false)
public class TrainMobileSignColumn {
private static final long serialVersionUID = 1L;
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java
+6 -8
View File
@@ -4,6 +4,7 @@ import com.budwk.app.base.model.BaseModel;
import com.budwk.app.sys.models.Sys_home_activity;
import com.budwk.app.sys.services.SysHomeConvert;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
@@ -13,14 +14,11 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author zxy
* @Description 培训报名活动
* @createTime 2022年02月23日 08:57:00
*/
@Table
@Data
@Accessors(chain = true)
@Comment("品牌活动")
@Table
@EqualsAndHashCode(callSuper = false)
public class TrainSignUpActivity extends BaseModel implements Serializable, SysHomeConvert {
@Name
@@ -122,8 +120,8 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH
sysHomeActivity.setId(this.getId());
sysHomeActivity.setName(this.getActivityName());
sysHomeActivity.setCover(this.getCover());
sysHomeActivity.setUrl("/platform/trainSingUp/apply");
sysHomeActivity.setH5Url("/platform/trainSingUp/apply/h5?id=" + this.getId());
sysHomeActivity.setUrl("/platform/trainSignUp/apply");
sysHomeActivity.setH5Url("/platform/trainSignUp/apply/h5?id=" + this.getId());
if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) {
sysHomeActivity.setStartDate(this.getActivitySignUpStartTime());
sysHomeActivity.setEndDate(this.getActivitySignUpEndTime());
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivityCourse.java
+4 -6
View File
@@ -1,20 +1,18 @@
package com.budwk.app.zhgh.activity.trainSignUp.models;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
import java.util.Date;
/**
* @author zxy
* @Description 活动下的课程
* @createTime 2022年02月23日 09:26:00
*/
@Table
@Data
@Accessors(chain = true)
@Comment("品牌活动下的子活动")
@Table
@EqualsAndHashCode(callSuper = false)
public class TrainSignUpActivityCourse {
@Name
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpBlackList.java
+6 -6
View File
@@ -1,16 +1,16 @@
package com.budwk.app.zhgh.activity.trainSignUp.models;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
/**
* @author zxy
* @Description 黑名单
* @createTime 2022年03月07日 14:32:00
*/
@Table
@Data
@Accessors(chain = true)
@Comment("品牌活动黑名单")
@Table
@EqualsAndHashCode(callSuper = false)
public class TrainSignUpBlackList {
@Name
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpCourse.java
+4 -6
View File
@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.activity.trainSignUp.models;
import com.budwk.app.base.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
@@ -10,14 +11,11 @@ import org.nutz.lang.util.NutMap;
import java.io.Serializable;
import java.util.List;
/**
* @author zxy
* @Description 培训班信息
* @createTime 2022年02月23日 09:04:00
*/
@Table
@Data
@Accessors(chain = true)
@Comment("品牌活动的子活动")
@Table
@EqualsAndHashCode(callSuper = false)
public class TrainSignUpCourse extends BaseModel implements Serializable {
@Name
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpType.java
+4 -7
View File
@@ -3,6 +3,7 @@ package com.budwk.app.zhgh.activity.trainSignUp.models;
import com.budwk.app.base.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
@@ -10,15 +11,11 @@ import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* TODO
*
* @author 赵欣雨
* @date 2020/8/18 9:16
*/
@Data
@Accessors(chain = true)
@Comment("品牌活动的子活动类型")
@Table("train_sign_up_type")
@EqualsAndHashCode(callSuper = true)
@EqualsAndHashCode(callSuper = false)
public class TrainSignUpType extends BaseModel implements Serializable {
@Serial
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpTypeLimit.java
+6 -6
View File
@@ -1,18 +1,18 @@
package com.budwk.app.zhgh.activity.trainSignUp.models;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
import java.io.Serializable;
/**
* @Author JyuHsin
* @Date 2022/9/22
* @Description
*/
@Table("train_sign_up_type_limit")
@Data
@Accessors(chain = true)
@Comment("品牌活动类型限制条件")
@Table("train_sign_up_type_limit")
@EqualsAndHashCode(callSuper = false)
public class TrainSignUpTypeLimit implements Serializable {
private static final long serialVersionUID = 1L;
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpUser.java
+4 -6
View File
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.activity.trainSignUp.models;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
@@ -10,14 +11,11 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author zxy
* @Description 报名人员 报名记录
* @createTime 2022年02月23日 09:34:00
*/
@Table
@Data
@Accessors(chain = true)
@Comment("品牌活动报名人员")
@Table
@EqualsAndHashCode(callSuper = false)
@TableIndexes({@Index(name = "INDEX_TRAIN_SIGN_UP_USER_COURSEID", fields = {"courseId"}, unique = false)})
public class TrainSignUpUser implements Serializable {
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpUserCourse.java
+4 -6
View File
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.activity.trainSignUp.models;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
@@ -8,14 +9,11 @@ import org.nutz.dao.interceptor.annotation.PrevInsert;
import java.io.Serializable;
import java.util.Date;
/**
* @author zxy
* @Description 用户课程表
* @createTime 2022年02月23日 09:38:00
*/
@Table
@Data
@Accessors(chain = true)
@Comment("品牌活动报名人员子活动表")
@Table
@EqualsAndHashCode(callSuper = false)
@TableIndexes({
@Index(name = "INDEX_TRAIN_SIGN_UP_USER_COURSE_USERID", fields = {"userId"}, unique = false),
@Index(name = "INDEX_TRAIN_SIGN_UP_USER_COURSE_COURSEID", fields = {"courseId"}, unique = false)