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

福利

Browse Source
This commit is contained in:
Paidax
2024-12-24 15:55:26 +08:00
parent 9886b06c4a
commit 414f91c50a
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java
+4
View File
@@ -125,6 +125,7 @@ public class WelfareProjectMangeController {
Trans.exec(() -> { Trans.exec(() -> {
project.setYear(DateUtil.thisYear()); project.setYear(DateUtil.thisYear());
project.setIsDisabled(false);
if (project.getConditionStructure() != null) { if (project.getConditionStructure() != null) {
project.setConditionStructureId(matchConditionStructureService.save(project.getConditionStructure()).getId()); project.setConditionStructureId(matchConditionStructureService.save(project.getConditionStructure()).getId());
} }
@@ -244,6 +245,7 @@ public class WelfareProjectMangeController {
} }
Sys_home_activity sysHomeActivity = project.covertToSysHomeActivity(); Sys_home_activity sysHomeActivity = project.covertToSysHomeActivity();
sysHomeActivity.setEnable(true);
dao.insertOrUpdate(sysHomeActivity); dao.insertOrUpdate(sysHomeActivity);
}); });
return null; return null;
@@ -328,9 +330,11 @@ public class WelfareProjectMangeController {
*/ */
@At @At
@ViReturn @ViReturn
@Aop(TransAop.READ_COMMITTED)
@RequiresPermissions("welfare.list.mange") @RequiresPermissions("welfare.list.mange")
public Object projectStatusChange(String id, boolean val) { public Object projectStatusChange(String id, boolean val) {
dao.update(WelfareProject.class, Chain.make("isDisabled", !val), Cnd.where("id", "=", id)); dao.update(WelfareProject.class, Chain.make("isDisabled", !val), Cnd.where("id", "=", id));
dao.update(Sys_home_activity.class, Chain.make("enable", val), Cnd.where("id", "=", id));
return null; return null;
} }
src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java
+1 -1
View File
@@ -224,7 +224,7 @@ public class WelfareProject extends BaseModel implements Serializable, SysHomeCo
sysHomeActivity.setName(this.getName()); sysHomeActivity.setName(this.getName());
sysHomeActivity.setCover(this.getCover()); sysHomeActivity.setCover(this.getCover());
sysHomeActivity.setUrl("/platform/welfare/userChoose"); sysHomeActivity.setUrl("/platform/welfare/userChoose");
sysHomeActivity.setH5Url("/mobile/welfare/list/index"); sysHomeActivity.setH5Url("/mobile/welfare/list/receive?projectId=" + this.getId());
sysHomeActivity.setStartDate(this.getChoiceTimeStart()); sysHomeActivity.setStartDate(this.getChoiceTimeStart());
sysHomeActivity.setEndDate(this.getChoiceTimeEnd()); sysHomeActivity.setEndDate(this.getChoiceTimeEnd());
sysHomeActivity.setAllowUserSql("select userId from welfare_list where projectId = '" + this.getId() + "' and userId = @userId"); sysHomeActivity.setAllowUserSql("select userId from welfare_list where projectId = '" + this.getId() + "' and userId = @userId");
src/main/resources/views/mobile/home.html
+2 -2
View File
@@ -710,8 +710,8 @@ layout("/mobile/platform.html"){
const active = sessionStorage.getItem("zhgh-mobile-home-active") const active = sessionStorage.getItem("zhgh-mobile-home-active")
this.active = active ? parseInt(active) : 0 this.active = active ? parseInt(active) : 0
this.clickIndex = 2 // this.clickIndex = 2
this.clickMenu = this.moduleMenus.find(o => o.moduleName === '日常办公') // this.clickMenu = this.moduleMenus.find(o => o.moduleName === '日常办公')
} }
}) })