commit

2026-04-24 14:27:55 +08:00
parent c2f93eb4b3
commit 3207e0a594
46 changed files with 1993 additions and 325 deletions
@@ -15,7 +15,6 @@ import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.service.FlowCommonService;
-import com.budwk.app.sys.models.Sys_home_activity;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
@@ -151,8 +150,7 @@ public class ActivityCultureApplyActivityController {
            return Result.success();
        }
        if (tissue.getIsEnrollSystem()) {
-            Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
-            activityCultureService.insertOrUpdate(sysHomeActivity);
+            activityCultureService.syncHomeActivity(tissue);
        }
        return Result.success();
    }
@@ -9,7 +9,6 @@ import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.flow.service.FlowCommonService;
-import com.budwk.app.sys.models.Sys_home_activity;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
 import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService;
@@ -144,8 +143,7 @@ public class ActivityCultureAuditActivityController {
        tissue.setIsUnseal(true);
        activityCultureService.update(tissue);
        if (args.getInt("submitType") == 1) {
-            Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
-            activityCultureService.insertOrUpdate(sysHomeActivity);
+            activityCultureService.syncHomeActivity(tissue);
        }
        flowCommonService.executeTask(args);
        return Result.success();
@@ -74,9 +74,15 @@ public class ActivityCultureInfoManageController {
    @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.union", "activity.culture.infoManage.club"}, mode = SaMode.OR)
    public Result activityStatusChange(@Valid String id, @Valid Boolean isUnseal) {
        activityCultureService.update(Chain.make("isUnseal", isUnseal), Cnd.where("id", "=", id));
-        activityCultureService.dao().update(Sys_home_activity.class,
-                Chain.make("enable", isUnseal),
-                Cnd.where("id", "=", id));
+        ActivityTissue tissue = activityCultureService.fetch(id);
+        tissue.setIsUnseal(isUnseal);
+        if (Boolean.TRUE.equals(isUnseal)) {
+            activityCultureService.syncHomeActivity(tissue);
+        } else {
+            activityCultureService.dao().update(Sys_home_activity.class,
+                    Chain.make("enable", false),
+                    Cnd.where("id", "=", id));
+        }
        return Result.success();
    }

@@ -24,4 +24,14 @@ public interface ActivityCultureService extends BaseService<ActivityTissue> {
    Object pageData(PageForm page, String year, String name, String unionId, Integer activity_type);

    NutMap findOne(String id);
+
+    /**
+     * 同步文化活动到首页活动表。
+     * 1. 非报名类活动不推送首页，直接清理首页记录。
+     * 2. 校工会活动没有审核流，提交后默认可推首页。
+     * 3. 分工会、协会活动仅在已审核通过或已存在首页记录时更新首页信息。
+     *
+     * @param tissue 文化活动
+     */
+    void syncHomeActivity(ActivityTissue tissue);
 }
@@ -5,6 +5,7 @@ import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.model.Audit;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.sys.models.Sys_home_activity;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.basic.service.ActivityBasicScopeService;
@@ -80,6 +81,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
    @Override
    public void doEditActivity(ActivityTissue tissue) {
        update(tissue);
+        syncHomeActivity(tissue);
    }

    @Override
@@ -123,6 +125,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
        cnd.andEX("tissue.projectTypeCode", "!=", "50004");
        cnd.andEX("tissue.unionId", "=", unionId);
        cnd.andEX("tissue.activity_type", "=", activity_type);
+        cnd.groupBy("tissue.id");

        if (Strings.isNotBlank(name)) {
            cnd.where().andLike("tissue.name", name);
@@ -188,4 +191,38 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>

        return nutMap;
    }
+
+    @Override
+    public void syncHomeActivity(ActivityTissue tissue) {
+        if (tissue == null || Strings.isBlank(tissue.getId())) {
+            return;
+        }
+        // 非报名活动不需要出现在首页，编辑成活动管理模式时同步移除首页记录。
+        if (!Boolean.TRUE.equals(tissue.getIsEnrollSystem())) {
+            dao().delete(Sys_home_activity.class, tissue.getId());
+            return;
+        }
+
+        Sys_home_activity oldHomeActivity = dao().fetch(Sys_home_activity.class, tissue.getId());
+        boolean canCreateHomeActivity = (tissue.getActivity_type() != null
+                && tissue.getActivity_type() == 40001)
+                || Boolean.TRUE.equals(tissue.getIsUnseal())
+                || oldHomeActivity != null;
+        if (!canCreateHomeActivity) {
+            return;
+        }
+
+        Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
+        // 校工会文化活动没有审核环节，前端未回传启用状态时默认直接上首页。
+        if (tissue.getActivity_type() != null && tissue.getActivity_type() == 40001 && tissue.getIsUnseal() == null) {
+            sysHomeActivity.setEnable(true);
+        }
+        // 保留首页管理中手工设置的置顶、大图和排序，避免活动编辑时被覆盖。
+        if (oldHomeActivity != null) {
+            sysHomeActivity.setTop(oldHomeActivity.getTop());
+            sysHomeActivity.setPush(oldHomeActivity.getPush());
+            sysHomeActivity.setSortNo(oldHomeActivity.getSortNo());
+        }
+        dao().insertOrUpdate(sysHomeActivity);
+    }
 }
@@ -60,6 +60,7 @@ public class H5ActivityWorksUploadCollectionController {
                  awc.*
                FROM
                  `activity_works_collection` awc
+                $condition
                """);
        Cnd cnd = Cnd.NEW();
        cnd.andEX("YEAR(awc.startDateTime)", "=", year);
@@ -68,9 +69,9 @@ public class H5ActivityWorksUploadCollectionController {
            cnd.and(new Static("now() > awc.startDateTime and now() < awc.endDateTime"));
        }//查询已结束的
        else if (activityType == 3) {
-            cnd.and(new Static("now() > awc.startDateTime"));
+            cnd.and(new Static("now() >= awc.endDateTime"));
        } else if (activityType == 4) {
-            cnd.and(new Static("now() < awc.endDateTime"));
+            cnd.and(new Static("now() < awc.startDateTime"));
        }
        cnd.and("awc.enable", "=", 1);
        cnd.and("awc.type", "=", 1);