commit
This commit is contained in:
@@ -66,7 +66,7 @@ public class SysH5IndexController {
|
|||||||
@Ok("json")
|
@Ok("json")
|
||||||
public Result listHomeActivity() {
|
public Result listHomeActivity() {
|
||||||
FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath");
|
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();
|
String userId = SecurityUtil.getUserId();
|
||||||
List<Sys_home_activity> allowActivityList = new ArrayList<>();
|
List<Sys_home_activity> allowActivityList = new ArrayList<>();
|
||||||
// 今天的时间
|
// 今天的时间
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public class SysHomeController {
|
|||||||
@Ok("json")
|
@Ok("json")
|
||||||
public Result listHomeActivity() {
|
public Result listHomeActivity() {
|
||||||
FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath");
|
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();
|
String userId = SecurityUtil.getUserId();
|
||||||
List<Sys_home_activity> allowActivityList = new ArrayList<>();
|
List<Sys_home_activity> allowActivityList = new ArrayList<>();
|
||||||
// 今天的时间
|
// 今天的时间
|
||||||
|
|||||||
@@ -273,6 +273,8 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
|
|||||||
sysHomeActivity.setAllowUserGroupId(this.getGroupId());
|
sysHomeActivity.setAllowUserGroupId(this.getGroupId());
|
||||||
sysHomeActivity.setEnable(this.getIsUnseal());
|
sysHomeActivity.setEnable(this.getIsUnseal());
|
||||||
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
||||||
|
sysHomeActivity.setCreatedAt(this.getCreatedAt());
|
||||||
|
sysHomeActivity.setUpdatedAt(this.getUpdatedAt());
|
||||||
return sysHomeActivity;
|
return sysHomeActivity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -147,6 +147,8 @@ public class FamilyActivity extends BaseModel implements Serializable, SysHomeCo
|
|||||||
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
||||||
sysHomeActivity.setEnable(!this.isDisabled());
|
sysHomeActivity.setEnable(!this.isDisabled());
|
||||||
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
||||||
|
sysHomeActivity.setCreatedAt(this.getCreatedAt());
|
||||||
|
sysHomeActivity.setUpdatedAt(this.getUpdatedAt());
|
||||||
return sysHomeActivity;
|
return sysHomeActivity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -121,6 +121,8 @@ public class QsvActivity extends BaseModel implements Serializable, SysHomeConve
|
|||||||
sysHomeActivity.setEndDate(this.getEndTime());
|
sysHomeActivity.setEndDate(this.getEndTime());
|
||||||
sysHomeActivity.setAllowUserGroupId(this.getGroupId());
|
sysHomeActivity.setAllowUserGroupId(this.getGroupId());
|
||||||
sysHomeActivity.setEnable(true);
|
sysHomeActivity.setEnable(true);
|
||||||
|
sysHomeActivity.setCreatedAt(this.getCreatedAt());
|
||||||
|
sysHomeActivity.setUpdatedAt(this.getUpdatedAt());
|
||||||
return sysHomeActivity;
|
return sysHomeActivity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -215,6 +215,8 @@ public class ActivitySchool extends BaseModel implements Serializable, SysHomeCo
|
|||||||
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
||||||
sysHomeActivity.setEnable(true);
|
sysHomeActivity.setEnable(true);
|
||||||
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
||||||
|
sysHomeActivity.setCreatedAt(this.getCreatedAt());
|
||||||
|
sysHomeActivity.setUpdatedAt(this.getUpdatedAt());
|
||||||
return sysHomeActivity;
|
return sysHomeActivity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -146,6 +146,8 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH
|
|||||||
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
||||||
sysHomeActivity.setEnable(!this.isDisabled());
|
sysHomeActivity.setEnable(!this.isDisabled());
|
||||||
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
||||||
|
sysHomeActivity.setCreatedAt(this.getCreatedAt());
|
||||||
|
sysHomeActivity.setUpdatedAt(this.getUpdatedAt());
|
||||||
return sysHomeActivity;
|
return sysHomeActivity;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,6 +98,8 @@ public class EvaluateActivity extends BaseModel implements Serializable, SysHome
|
|||||||
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());
|
||||||
sysHomeActivity.setEnable(this.getEnable());
|
sysHomeActivity.setEnable(this.getEnable());
|
||||||
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
||||||
|
sysHomeActivity.setCreatedAt(this.getCreatedAt());
|
||||||
|
sysHomeActivity.setUpdatedAt(this.getUpdatedAt());
|
||||||
return sysHomeActivity;
|
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.setAllowUserSql("select userId from welfare_list where projectId = '" + this.getId() + "' and userId = @userId");
|
||||||
sysHomeActivity.setEnable(true);
|
sysHomeActivity.setEnable(true);
|
||||||
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
|
||||||
|
sysHomeActivity.setCreatedAt(this.getCreatedAt());
|
||||||
|
sysHomeActivity.setUpdatedAt(this.getUpdatedAt());
|
||||||
return sysHomeActivity;
|
return sysHomeActivity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user