c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2024-12-10 18:59:42 +08:00
parent fa4ac9605d
commit 9c5a41627f
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
+9 -12
View File
@@ -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;
}
}
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java
+9 -3
View File
@@ -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()));
}
}*/
}