From 8dad7c09bace18016900279aec253622cd4167bd Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Tue, 30 Sep 2025 15:48:57 +0800 Subject: [PATCH] commit --- .../controller/CheckInActivityController.java | 15 +++++++++++ .../controller/CheckInListController.java | 4 ++- .../zhgh/checkIn/model/CheckInActivity.java | 27 ++++++++++++++++++- .../views/mobile/checkIn/list/index.html | 18 +++++++++++-- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInActivityController.java b/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInActivityController.java index de2a229..97df42d 100644 --- a/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInActivityController.java +++ b/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInActivityController.java @@ -5,8 +5,11 @@ import cn.hutool.core.util.StrUtil; import io.v.nutz.base.page.Pagination; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.result.Result; +import io.v.nutz.sys.models.Sys_home_activity; +import io.v.nutz.sys.models.Sys_user; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.checkIn.model.CheckInActivity; import io.v.nutz.zhgh.checkIn.model.CheckInContent; import io.v.nutz.zhgh.checkIn.model.CheckInPraise; @@ -80,6 +83,13 @@ public class CheckInActivityController { activity.setCreatTime(DateUtil.now()); } activityService.insertOrUpdate(activity); + + if (activity.getEnable()) { + Sys_home_activity sysHomeActivity = activity.covertToSysHomeActivity(); + dao.insertOrUpdate(sysHomeActivity); + } else { + dao.delete(Sys_home_activity.class, activity.getId()); + } return Result.success(); } @@ -99,8 +109,13 @@ public class CheckInActivityController { CheckInActivity check = activityService.fetch(id); int count = dao.count(CheckInContent.class, Cnd.where("activityId", "=", id).and("userId", "=", ShiroUtil.getUserId())); + ActivityUserScope scope = dao.fetch(ActivityUserScope.class, Cnd.where("groupId", "=", check.getGroupId()).and("userId", "=", ShiroUtil.getUserId())); + Sys_user user = dao.fetch(Sys_user.class, Cnd.where("id", "=", check.getCreatedBy())); + NutMap nutMap = Lang.obj2nutmap(check); nutMap.put("checkCount", count); + nutMap.put("groupName", scope.getGroupName()); + nutMap.put("userName", user.getUsername()); return Result.success(nutMap); } diff --git a/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInListController.java b/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInListController.java index 5cfc5f6..44a0fdf 100644 --- a/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInListController.java +++ b/src/main/java/io/v/nutz/zhgh/checkIn/controller/CheckInListController.java @@ -47,7 +47,8 @@ public class CheckInListController { @At @RequiresAuthentication public Result pageData(PageForm pageForm, - @Param(value = "year") Integer year) { + @Param(value = "year") Integer year, + @Param(value = "id") String id) { Sql sql = Sqls.create(""" SELECT c.*, @@ -59,6 +60,7 @@ public class CheckInListController { $condition """).setParam("userId", ShiroUtil.getUserId()); Cnd cnd = Cnd.NEW(); + cnd.andEX("c.id", "=", id); cnd.and("enable", "=", true); cnd.and(Cnd.likeEX("name", pageForm.getSearchKeyword())); cnd.andEX("year(creatTime)", "=", year); diff --git a/src/main/java/io/v/nutz/zhgh/checkIn/model/CheckInActivity.java b/src/main/java/io/v/nutz/zhgh/checkIn/model/CheckInActivity.java index ac3e859..940d3a8 100644 --- a/src/main/java/io/v/nutz/zhgh/checkIn/model/CheckInActivity.java +++ b/src/main/java/io/v/nutz/zhgh/checkIn/model/CheckInActivity.java @@ -1,10 +1,16 @@ package io.v.nutz.zhgh.checkIn.model; import io.v.nutz.base.model.BaseModel; +import io.v.nutz.base.utils.DateUtil; +import io.v.nutz.sys.models.Sys_home_activity; +import io.v.nutz.sys.services.SysHomeConvert; import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; +import org.nutz.lang.Lang; + +import java.io.Serializable; /** * @ClassName CheckActivity @@ -18,7 +24,7 @@ import org.nutz.dao.interceptor.annotation.PrevInsert; @Comment("主题打卡") @EqualsAndHashCode(callSuper = true) @TableMeta("{'mysql-charset':'utf8mb4'}") -public class CheckInActivity extends BaseModel { +public class CheckInActivity extends BaseModel implements Serializable, SysHomeConvert { @Name @Comment("ID") @@ -70,4 +76,23 @@ public class CheckInActivity extends BaseModel { @Comment("分组Id") @ColDefine(type = ColType.INT) private Integer groupId; + + @Override + public Sys_home_activity covertToSysHomeActivity() { + Sys_home_activity sysHomeActivity = new Sys_home_activity(); + sysHomeActivity.setId(this.getId()); + sysHomeActivity.setName(this.getName()); + sysHomeActivity.setCover(this.getCover()); + sysHomeActivity.setUrl(""); + sysHomeActivity.setH5Url("/platform/checkIn/list/h5?id=" + this.getId()); + if (Lang.isNotEmpty(this.getStartTime())) { + sysHomeActivity.setStartDate(cn.hutool.core.date.DateUtil.parseDate(this.getStartTime())); + sysHomeActivity.setEndDate(cn.hutool.core.date.DateUtil.parseDate(this.getEndTime())); + } + sysHomeActivity.setAllowUserGroupId(this.getGroupId()); + sysHomeActivity.setEnable(this.getEnable()); + sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + return sysHomeActivity; + + } } diff --git a/src/main/resources/views/mobile/checkIn/list/index.html b/src/main/resources/views/mobile/checkIn/list/index.html index 50368ba..d1db38a 100644 --- a/src/main/resources/views/mobile/checkIn/list/index.html +++ b/src/main/resources/views/mobile/checkIn/list/index.html @@ -16,7 +16,7 @@ layout("/mobile/platform.html"){ - +