This commit is contained in:
=
2026-05-27 10:07:13 +08:00
parent 64c359b59d
commit a35966ef64
9 changed files with 16 additions and 2 deletions
@@ -66,7 +66,7 @@ public class SysH5IndexController {
@Ok("json")
public Result listHomeActivity() {
FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath");
List<Sys_home_activity> list = Daos.ext(dao,fieldFilter) .query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top").desc("createdAt"));
List<Sys_home_activity> 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<Sys_home_activity> allowActivityList = new ArrayList<>();
// 今天的时间
@@ -166,7 +166,7 @@ public class SysHomeController {
@Ok("json")
public Result listHomeActivity() {
FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath");
List<Sys_home_activity> list = Daos.ext(dao, fieldFilter).query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top").desc("createdAt"));
List<Sys_home_activity> 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<Sys_home_activity> allowActivityList = new ArrayList<>();
// 今天的时间
@@ -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;
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
@@ -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;
}
}
@@ -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;
}
}