From a35966ef64eda30a3b4333c84a2e3fcc935999af Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 27 May 2026 10:07:13 +0800 Subject: [PATCH] commit --- .../java/com/budwk/app/sys/controller/SysH5IndexController.java | 2 +- .../java/com/budwk/app/sys/controller/SysHomeController.java | 2 +- .../budwk/app/zhgh/activity/culture/models/ActivityTissue.java | 2 ++ .../budwk/app/zhgh/activity/family/models/FamilyActivity.java | 2 ++ .../com/budwk/app/zhgh/activity/qsv/models/QsvActivity.java | 2 ++ .../budwk/app/zhgh/activity/sports/models/ActivitySchool.java | 2 ++ .../zhgh/activity/trainSignUp/models/TrainSignUpActivity.java | 2 ++ .../zhgh/dayofficework/evaluation/models/EvaluateActivity.java | 2 ++ .../java/com/budwk/app/zhgh/welfare/model/WelfareProject.java | 2 ++ 9 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysH5IndexController.java b/src/main/java/com/budwk/app/sys/controller/SysH5IndexController.java index 5a3f4b8..33bdd86 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysH5IndexController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysH5IndexController.java @@ -66,7 +66,7 @@ public class SysH5IndexController { @Ok("json") public Result listHomeActivity() { FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath"); - List list = Daos.ext(dao,fieldFilter) .query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top").desc("createdAt")); + List list = Daos.ext(dao,fieldFilter) .query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top").desc("createdAt").desc("updatedAt")); String userId = SecurityUtil.getUserId(); List allowActivityList = new ArrayList<>(); // 今天的时间 diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index 8f4b836..6c1bfbd 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -166,7 +166,7 @@ public class SysHomeController { @Ok("json") public Result listHomeActivity() { FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath"); - List list = Daos.ext(dao, fieldFilter).query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top").desc("createdAt")); + List list = Daos.ext(dao, fieldFilter).query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top").desc("createdAt").desc("updatedAt")); String userId = SecurityUtil.getUserId(); List allowActivityList = new ArrayList<>(); // 今天的时间 diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index a72512f..524c4cc 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -273,6 +273,8 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo sysHomeActivity.setAllowUserGroupId(this.getGroupId()); sysHomeActivity.setEnable(this.getIsUnseal()); sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + sysHomeActivity.setCreatedAt(this.getCreatedAt()); + sysHomeActivity.setUpdatedAt(this.getUpdatedAt()); return sysHomeActivity; } diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java b/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java index 6439ee7..2788996 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java @@ -147,6 +147,8 @@ public class FamilyActivity extends BaseModel implements Serializable, SysHomeCo sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId()); sysHomeActivity.setEnable(!this.isDisabled()); sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + sysHomeActivity.setCreatedAt(this.getCreatedAt()); + sysHomeActivity.setUpdatedAt(this.getUpdatedAt()); return sysHomeActivity; } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/qsv/models/QsvActivity.java b/src/main/java/com/budwk/app/zhgh/activity/qsv/models/QsvActivity.java index 7a0fb72..8d23481 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/qsv/models/QsvActivity.java +++ b/src/main/java/com/budwk/app/zhgh/activity/qsv/models/QsvActivity.java @@ -121,6 +121,8 @@ public class QsvActivity extends BaseModel implements Serializable, SysHomeConve sysHomeActivity.setEndDate(this.getEndTime()); sysHomeActivity.setAllowUserGroupId(this.getGroupId()); sysHomeActivity.setEnable(true); + sysHomeActivity.setCreatedAt(this.getCreatedAt()); + sysHomeActivity.setUpdatedAt(this.getUpdatedAt()); return sysHomeActivity; } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java index 95c1651..10b81ab 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java @@ -215,6 +215,8 @@ public class ActivitySchool extends BaseModel implements Serializable, SysHomeCo sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId()); sysHomeActivity.setEnable(true); sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + sysHomeActivity.setCreatedAt(this.getCreatedAt()); + sysHomeActivity.setUpdatedAt(this.getUpdatedAt()); return sysHomeActivity; } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java index 64ce77d..cc8362e 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java @@ -146,6 +146,8 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId()); sysHomeActivity.setEnable(!this.isDisabled()); sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + sysHomeActivity.setCreatedAt(this.getCreatedAt()); + sysHomeActivity.setUpdatedAt(this.getUpdatedAt()); return sysHomeActivity; } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateActivity.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateActivity.java index cfea754..f040984 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateActivity.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateActivity.java @@ -98,6 +98,8 @@ public class EvaluateActivity extends BaseModel implements Serializable, SysHome sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId()); sysHomeActivity.setEnable(this.getEnable()); sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + sysHomeActivity.setCreatedAt(this.getCreatedAt()); + sysHomeActivity.setUpdatedAt(this.getUpdatedAt()); return sysHomeActivity; } } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java index 19eef53..de0dd04 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java @@ -222,6 +222,8 @@ public class WelfareProject extends BaseModel implements SysHomeConvert { sysHomeActivity.setAllowUserSql("select userId from welfare_list where projectId = '" + this.getId() + "' and userId = @userId"); sysHomeActivity.setEnable(true); sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + sysHomeActivity.setCreatedAt(this.getCreatedAt()); + sysHomeActivity.setUpdatedAt(this.getUpdatedAt()); return sysHomeActivity; } }