This commit is contained in:
2024-12-10 19:12:46 +08:00
parent 9c5a41627f
commit a453c6b0e3
6 changed files with 18 additions and 6 deletions
@@ -175,7 +175,7 @@ public class ActivityUnionManageController {
tissue.getCover(); tissue.getCover();
activityTissueService.insertWith(tissue, "tissuePersonList"); activityTissueService.insertWith(tissue, "tissuePersonList");
activitySchoolService.dao().insert(tissue.getGoods()); activitySchoolService.dao().insert(tissue.getGoods());
if (tissue.getIsPushHome()!=0) { if (tissue.getIsEnrollSystem()) {
Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
activityTissueService.dao().insertOrUpdate(sysHomeActivity); activityTissueService.dao().insertOrUpdate(sysHomeActivity);
} }
@@ -311,7 +311,7 @@ public class ActivityUnionManageController {
public Object activityStatusChange(String id, String isDisabled) { public Object activityStatusChange(String id, String isDisabled) {
activityTissueService.update(Chain.make("isDisabled", "1".equals(isDisabled)), Cnd.where("id", "=", id)); activityTissueService.update(Chain.make("isDisabled", "1".equals(isDisabled)), Cnd.where("id", "=", id));
activityTissueService.dao().update(Sys_home_activity.class, activityTissueService.dao().update(Sys_home_activity.class,
Chain.make("enable", isDisabled), Chain.make("enable", "1".equals(isDisabled)),
Cnd.where("id", "=", id)); Cnd.where("id", "=", id));
return null; return null;
} }
@@ -217,7 +217,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
@Column @Column
@Comment("是否报名系统") @Comment("是否报名系统")
@ColDefine(type = ColType.BOOLEAN) @ColDefine(type = ColType.BOOLEAN)
private boolean isEnrollSystem; private Boolean isEnrollSystem;
@Many(field = "tissueId") @Many(field = "tissueId")
private List<ActivityTissuePerson> tissuePersonList; private List<ActivityTissuePerson> tissuePersonList;
@@ -133,7 +133,7 @@ public class ActivityTissueServiceImpl extends ViServiceImpl<ActivityTissue> imp
v.setReid(tissue.getId()); v.setReid(tissue.getId());
}); });
tissuePersonService.dao().insert(tissue.getGoods()); tissuePersonService.dao().insert(tissue.getGoods());
if (tissue.getIsPushHome()!=0) { if (tissue.getIsEnrollSystem()) {
Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
dao().insertOrUpdate(sysHomeActivity); dao().insertOrUpdate(sysHomeActivity);
} else { } else {
@@ -497,7 +497,7 @@ public class UnionActivityRegisterController {
@RequiresAuthentication @RequiresAuthentication
public Object doSingleCancelRegister(String activityId, String applyUserId, String id) { public Object doSingleCancelRegister(String activityId, String applyUserId, String id) {
ActivityTissue tissue = simpleService.dao().fetch(ActivityTissue.class, activityId); ActivityTissue tissue = simpleService.dao().fetch(ActivityTissue.class, activityId);
if (!tissue.isEnrollSystem()) { if (!tissue.getIsEnrollSystem()) {
simpleService.dao().delete(ActivityTissuePerson.class, id); simpleService.dao().delete(ActivityTissuePerson.class, id);
return Result.success().addMsg("取消成功!"); return Result.success().addMsg("取消成功!");
} }
@@ -5,6 +5,7 @@ import cn.wizzer.framework.page.Pagination;
import io.v.nutz.base.query.PageForm; import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.base.utils.Vi; 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.sys.models.Sys_user;
import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.data.constant.ConditionalOperational; import io.v.nutz.zhgh.data.constant.ConditionalOperational;
@@ -107,6 +108,11 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl<TrainSignUpAct
v.setActivityId(activity.getId()); v.setActivityId(activity.getId());
dao().insert(v); dao().insert(v);
}); });
if (!activity.isDisabled()) {
Sys_home_activity sysHomeActivity = activity.covertToSysHomeActivity();
dao().insertOrUpdate(sysHomeActivity);
}
} }
@Override @Override
@@ -219,6 +225,12 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl<TrainSignUpAct
dao().update("train_sign_up_user_course", chain, cnd); dao().update("train_sign_up_user_course", chain, cnd);
}); });
if (!activity.isDisabled()) {
Sys_home_activity sysHomeActivity = activity.covertToSysHomeActivity();
dao().insertOrUpdate(sysHomeActivity);
} else {
dao().delete(Sys_home_activity.class, activity.getId());
}
} }
@Override @Override
@@ -397,7 +397,7 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
<el-form-item label="封面图片" prop="cover"> <el-form-item label="封面图片" prop="cover">
<image-Upload :file-size="0.2" <image-Upload :file-size="4"
:file-type="['png','jpg']" :file-type="['png','jpg']"
:height="100" :height="100"
:limit="1" :limit="1"