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 d201564..185d1ba 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 @@ -175,7 +175,7 @@ public class ActivityUnionManageController { tissue.getCover(); activityTissueService.insertWith(tissue, "tissuePersonList"); activitySchoolService.dao().insert(tissue.getGoods()); - if (tissue.getIsPushHome()!=0) { + if (tissue.getIsEnrollSystem()) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); activityTissueService.dao().insertOrUpdate(sysHomeActivity); } @@ -311,7 +311,7 @@ public class ActivityUnionManageController { 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), + Chain.make("enable", "1".equals(isDisabled)), Cnd.where("id", "=", id)); return null; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java index 30e0452..e329ccb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java @@ -217,7 +217,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo @Column @Comment("是否报名系统") @ColDefine(type = ColType.BOOLEAN) - private boolean isEnrollSystem; + private Boolean isEnrollSystem; @Many(field = "tissueId") private List tissuePersonList; 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 4dbbd5a..ac3b80f 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 @@ -133,7 +133,7 @@ public class ActivityTissueServiceImpl extends ViServiceImpl imp v.setReid(tissue.getId()); }); tissuePersonService.dao().insert(tissue.getGoods()); - if (tissue.getIsPushHome()!=0) { + if (tissue.getIsEnrollSystem()) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); dao().insertOrUpdate(sysHomeActivity); } else { diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java index f17461c..7ed1fc9 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java @@ -497,7 +497,7 @@ public class UnionActivityRegisterController { @RequiresAuthentication public Object doSingleCancelRegister(String activityId, String applyUserId, String id) { ActivityTissue tissue = simpleService.dao().fetch(ActivityTissue.class, activityId); - if (!tissue.isEnrollSystem()) { + if (!tissue.getIsEnrollSystem()) { simpleService.dao().delete(ActivityTissuePerson.class, id); return Result.success().addMsg("取消成功!"); } diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java index edb9809..6fa3d41 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java @@ -5,6 +5,7 @@ import cn.wizzer.framework.page.Pagination; import io.v.nutz.base.query.PageForm; 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.sys.models.Sys_user; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.data.constant.ConditionalOperational; @@ -107,6 +108,11 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl -