From 9c5a41627fe1c0f5bfa3179f10bed6e8aa59e8f3 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Tue, 10 Dec 2024 18:59:42 +0800
Subject: [PATCH] commit

---
 .../union/ActivityUnionManageController.java  | 21 ++++++++-----------
 .../impl/ActivityTissueServiceImpl.java       | 12 ++++++++---
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
index 6dca24b..d201564 100644
--- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
+++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
@@ -14,6 +14,7 @@ import io.v.nutz.base.utils.DateUtil;
 import io.v.nutz.base.utils.OfficeTemplateUtil;
 import io.v.nutz.base.utils.Vi;
 import io.v.nutz.base.utils.ViTool;
+import io.v.nutz.sys.models.Sys_home_activity;
 import io.v.nutz.sys.models.Sys_user;
 import io.v.nutz.sys.services.SysMsgService;
 import io.v.nutz.web.commons.utils.ShiroUtil;
@@ -172,13 +173,12 @@ public class ActivityUnionManageController {
             v.setReid(tissue.getId());
         });
         tissue.getCover();
-
-        if (tissue.getIsPushHome()!= null && tissue.getIsPushHome()!=0) {
-            mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome());
-        }
-
         activityTissueService.insertWith(tissue, "tissuePersonList");
         activitySchoolService.dao().insert(tissue.getGoods());
+        if (tissue.getIsPushHome()!=0) {
+            Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
+            activityTissueService.dao().insertOrUpdate(sysHomeActivity);
+        }
         return null;
     }
 
@@ -186,12 +186,6 @@ public class ActivityUnionManageController {
     @ViReturn
     @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR)
     public Object doEdit(@Param("tissue") ActivityTissue tissue) {
-        if (tissue.getIsPushHome()!= null && tissue.getIsPushHome()!=0) {
-            mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome());
-        } else {
-            mobileHomeService.delete(tissue.getId());
-        }
-
         activityTissueService.doEdit(tissue);
         return null;
     }
@@ -201,7 +195,7 @@ public class ActivityUnionManageController {
     @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR)
     public Object doDelete(String id) {
         activityTissueService.doDelete(id);
-        mobileHomeService.delete(id);
+        activityTissueService.dao().delete(Sys_home_activity.class, id);
         return null;
     }
 
@@ -316,6 +310,9 @@ public class ActivityUnionManageController {
     @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR)
     public Object activityStatusChange(String id, String isDisabled) {
         activityTissueService.update(Chain.make("isDisabled", "1".equals(isDisabled)), Cnd.where("id", "=", id));
+        activityTissueService.dao().update(Sys_home_activity.class,
+                Chain.make("enable", isDisabled),
+                Cnd.where("id", "=", id));
         return null;
     }
 }
diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java
index d050134..4dbbd5a 100644
--- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java
@@ -8,6 +8,7 @@ import io.v.nutz.base.query.PageForm;
 import io.v.nutz.base.service.ViService;
 import io.v.nutz.base.service.impl.ViServiceImpl;
 import io.v.nutz.base.utils.Vi;
+import io.v.nutz.sys.models.Sys_home_activity;
 import io.v.nutz.web.commons.utils.ShiroUtil;
 import io.v.nutz.zhgh.activity.models.ActivityTissue;
 import io.v.nutz.zhgh.activity.models.ActivityTissuePerson;
@@ -132,8 +133,13 @@ public class ActivityTissueServiceImpl extends ViServiceImpl<ActivityTissue> imp
             v.setReid(tissue.getId());
         });
         tissuePersonService.dao().insert(tissue.getGoods());
-
-        if (Lang.isNotEmpty(tissue.getBillFiles())) {
+        if (tissue.getIsPushHome()!=0) {
+            Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
+            dao().insertOrUpdate(sysHomeActivity);
+        } else {
+            dao().delete(Sys_home_activity.class, tissue.getId());
+        }
+/*        if (Lang.isNotEmpty(tissue.getBillFiles())) {
             tissuePersonService.dao().update(ActivityBx.class, Chain.make("billFiles", tissue.getBillFiles()),
                     Cnd.where("activity_id", "=", tissue.getId()));
         }
@@ -144,7 +150,7 @@ public class ActivityTissueServiceImpl extends ViServiceImpl<ActivityTissue> imp
         if (Lang.isNotEmpty(tissue.getPhotoFiles())) {
             tissuePersonService.dao().update(ActivityBx.class, Chain.make("photoFiles", tissue.getPhotoFiles()),
                     Cnd.where("activity_id", "=", tissue.getId()));
-        }
+        }*/
 
 
     }