From ddf52e5e8674280aa64d23dd49cd0dd81e3c1857 Mon Sep 17 00:00:00 2001 From: Paidax Date: Fri, 26 Jul 2024 15:46:08 +0800 Subject: [PATCH] commit --- .../applets/ActivityListController.java | 8 +- .../basic/ActivityBasicScopeController.java | 12 +- .../ActivityBasicSettingsController.java | 6 +- .../basic/ActivityBasicUserController.java | 6 +- .../basic/ActivityEventController.java | 4 +- .../basic/ActivityUnionController.java | 12 +- .../basic/ActivityUnitController.java | 4 +- .../school/ActivityApplyController.java | 14 +- .../school/ActivityCalendarController.java | 2 +- .../school/ActivityCommonController.java | 248 ++----- .../school/ActivityGradesController.java | 10 +- .../school/ActivityPlanController.java | 6 +- .../school/ActivityPrizeListController.java | 4 +- .../school/ActivityReadingController.java | 12 +- .../school/ActivityRemindController.java | 24 +- .../school/ActivityResultsController.java | 14 +- .../school/ActivityReviewController.java | 4 +- .../ActivityScoreStatisticsController.java | 14 +- ...ctivityStatisticsTypeExportController.java | 8 +- .../site/SiteEquipmentController.java | 2 +- .../site/SiteReserveApplyController.java | 17 +- .../site/SiteReserveController.java | 2 +- .../site/SiteRetireProcessController.java | 5 +- .../controller/site/SiteReviewController.java | 10 +- .../site/SiteUnionProcessController.java | 12 +- .../v/nutz/zhgh/activity/controller/test.java | 76 --- .../union/ActivityAuditController.java | 4 +- .../union/ActivityUnionApplyController.java | 2 +- .../union/ActivityUnionManageController.java | 53 +- .../union/ActivityUnionPlanController.java | 6 +- ...ActivityUnionUserStatisticsController.java | 19 +- .../ActivityUnionYearSummaryController.java | 4 +- .../activity/models/ActivitySchoolApply.java | 1 + .../services/ActivityBasicScopeService.java | 2 +- .../services/ActivityPlanService.java | 2 +- .../services/ActivitySchoolApplyService.java | 2 +- .../services/ActivitySchoolService.java | 2 +- .../services/ActivityTissueService.java | 2 +- .../services/ActivityTypeService.java | 2 +- .../services/ActivityYearSummaryService.java | 2 +- .../activity/services/SiteReserveService.java | 5 +- .../impl/ActivityBasicScopeServiceImpl.java | 4 +- .../impl/ActivityCommonServiceImpl.java | 8 +- .../impl/ActivityPlanServiceImpl.java | 6 +- .../impl/ActivitySchoolApplyServiceImpl.java | 2 +- .../impl/ActivitySchoolServiceImpl.java | 6 +- .../impl/ActivityTissueServiceImpl.java | 17 +- .../impl/ActivityTypeServiceImpl.java | 6 +- .../impl/ActivityYearSummaryServiceImpl.java | 2 +- .../services/impl/SiteReserveServiceImpl.java | 16 +- .../controller/EvaluateApplyController.java | 40 +- .../controller/EvaluateController.java | 8 +- .../EvaluatePartyAuditController.java | 13 +- .../EvaluateSchoolAuditController.java | 14 +- .../controller/EvaluateSummaryController.java | 20 +- .../EvaluateUnionAuditController.java | 20 +- .../EvaluateUnitAuditController.java | 15 +- .../evaluate/handler/EvaluateToDoHandler.java | 10 +- .../service/EvaluateApplyService.java | 2 +- .../evaluate/service/EvaluateService.java | 2 +- .../impl/EvaluateServiceApplyImpl.java | 4 +- .../service/impl/EvaluateServiceImpl.java | 4 +- .../HealthCheckupListController.java | 1 + .../HealthCheckupProjectMangeController.java | 2 +- .../impl/HealthCheckupSingleServiceImpl.java | 14 +- .../activitybx/ApplyController.java | 2 +- .../service/impl/ActivityBxServiceImpl.java | 2 +- .../site/SiteAuditMobileController.java | 6 +- .../site/SiteInfoMobileApplyController.java | 2 +- .../site/SiteInfoMobileController.java | 2 +- .../UnionActivityMineController.java | 4 +- .../UnionActivityRegisterController.java | 36 +- .../MHealthCheckupListController.java | 2 +- .../zc/controller/ZgfwZcZhcxController.java | 14 +- src/main/resources/docTemplate/funds2.docx | Bin 13962 -> 12833 bytes src/main/resources/docTemplate/funds3.docx | Bin 13540 -> 13584 bytes .../activity/school/AddActivity.vue | 12 +- .../components/activity/school/DeleteInfo.vue | 2 +- .../components/activity/school/tissueInfo.vue | 44 +- .../components/welfare/CourierNumberInfo.vue | 7 +- .../mobile/activity/Sports/activityList.html | 39 +- .../unionActivity/common/activityInfo.html | 6 +- .../activity/unionActivity/register.html | 81 ++- .../activity/unionActivity/unionReg.html | 84 ++- .../activity/basic/ActivityBasic.html | 26 +- .../activity/basic/ActivityEvent.html | 59 +- .../activity/basic/ActivityUnion.html | 18 +- .../platform/activity/basic/ActivityUnit.html | 7 +- .../activity/school/ActivityApply.html | 617 +++++++++--------- .../activity/school/ActivityManage.html | 131 ++-- .../activity/school/ActivityReading.html | 4 +- .../activity/union/ActivityUnionPlan.html | 6 - .../platform/activity/union/addClubPlan.html | 6 - .../activity/union/addSchoolPlan.html | 6 - .../platform/activity/union/addUnionPlan.html | 6 - .../activity/union/applyActivity.html | 497 +++++++------- .../activity/union/layoutActivity.html | 128 ++-- .../platform/activity/union/layoutPlan.html | 6 - .../union/layoutStatisticsActivity.html | 91 ++- .../views/platform/evaluate/audit/school.html | 4 +- .../views/platform/evaluate/audit/union.html | 2 +- .../platform/evaluate/evaluateApply.html | 2 +- .../platform/evaluate/evaluateManage.html | 4 + .../views/platform/evaluate/summary.html | 2 +- .../views/platform/jf/Funds/apply.html | 2 +- .../jf/bxFundsLayout/association.html | 2 +- .../platform/jf/bxFundsLayout/division.html | 2 +- .../jf/bxFundsLayout/reimbursement.html | 2 +- .../platform/jf/reimbursement/apply.html | 2 +- 109 files changed, 1384 insertions(+), 1473 deletions(-) delete mode 100644 src/main/java/io/v/nutz/zhgh/activity/controller/test.java diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/applets/ActivityListController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/applets/ActivityListController.java index ce3b31a..48aa098 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/applets/ActivityListController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/applets/ActivityListController.java @@ -1,14 +1,14 @@ package io.v.nutz.zhgh.activity.controller.applets; -import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; -import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.Roles; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.Roles; import io.v.nutz.sys.models.Sys_user; +import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; +import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java index e7fc981..d49e793 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java @@ -5,16 +5,16 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.SimpleService; +import io.v.nutz.base.utils.Vi; import io.v.nutz.base.utils.ViTool; +import io.v.nutz.sys.models.Sys_role; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivityUserCnd; import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.activity.services.ActivityBasicScopeService; -import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.service.SimpleService; -import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.query.PageForm; -import io.v.nutz.sys.models.Sys_role; -import io.v.nutz.web.commons.utils.ShiroUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.ArrayUtils; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicSettingsController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicSettingsController.java index 703b0fe..49339a5 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicSettingsController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicSettingsController.java @@ -1,12 +1,12 @@ package io.v.nutz.zhgh.activity.controller.basic; import cn.wizzer.framework.base.Result; -import io.v.nutz.zhgh.activity.models.ActivityBasicSettings; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.AsyncService; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivityBasicSettings; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; @@ -47,8 +47,8 @@ public class ActivityBasicSettingsController { @RequiresPermissions("activity.basic.settings") public Object pageData(String parentId, PageForm pageForm) { CndPlus cnd = CndPlus.create(); - pageForm.setPageSize(50); - pageForm.setPageNumber(1); + /* pageForm.setPageSize(50); + pageForm.setPageNumber(1);*/ cnd.andEx("parentId", "=", parentId); cnd.asc("code"); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java index 83ac393..3d1bb7e 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java @@ -4,13 +4,13 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.StrUtil; -import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.service.SimpleService; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.SimpleService; +import io.v.nutz.base.utils.ViTool; import io.v.nutz.sys.models.User; import io.v.nutz.web.commons.utils.ShiroUtil; -import io.v.nutz.base.utils.ViTool; +import io.v.nutz.zhgh.activity.models.ActivityUserScope; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityEventController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityEventController.java index 9da98d8..2148189 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityEventController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityEventController.java @@ -1,12 +1,12 @@ package io.v.nutz.zhgh.activity.controller.basic; import cn.hutool.core.util.StrUtil; -import io.v.nutz.zhgh.activity.models.ActivityBasicSettings; -import io.v.nutz.zhgh.activity.models.ActivityEvent; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivityBasicSettings; +import io.v.nutz.zhgh.activity.models.ActivityEvent; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java index b4052b4..24f21b7 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java @@ -1,22 +1,22 @@ package io.v.nutz.zhgh.activity.controller.basic; import cn.wizzer.framework.base.Result; -import io.v.nutz.sys.models.*; -import io.v.nutz.zhgh.activity.models.ActivityBasicUnion; -import io.v.nutz.zhgh.activity.models.ActivityBasicUnit; -import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.lang.Lang; +import io.v.nutz.base.service.ViService; import io.v.nutz.base.utils.PageUtil; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.lang.Lang; -import io.v.nutz.base.service.ViService; +import io.v.nutz.sys.models.*; import io.v.nutz.sys.services.SysDictService; import io.v.nutz.sys.services.SysRoleService; import io.v.nutz.sys.services.SysUserRoleService; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.controller.ViCommonCon; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityBasicUnion; +import io.v.nutz.zhgh.activity.models.ActivityBasicUnit; +import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnitController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnitController.java index 1614700..0829022 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnitController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnitController.java @@ -1,16 +1,16 @@ package io.v.nutz.zhgh.activity.controller.basic; import cn.wizzer.framework.base.Result; -import io.v.nutz.zhgh.activity.models.ActivityBasicUnit; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.Roles; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.AsyncService; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.Roles; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.sys.services.SysUnitClassService; import io.v.nutz.sys.services.SysUserService; +import io.v.nutz.zhgh.activity.models.ActivityBasicUnit; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java index 9dfc543..037f3f7 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java @@ -1,21 +1,21 @@ package io.v.nutz.zhgh.activity.controller.school; import cn.wizzer.framework.base.Result; -import io.v.nutz.zhgh.activity.models.*; -import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolTeamService; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.service.SimpleService; -import io.v.nutz.base.utils.DateUtil; -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.SimpleService; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.DateUtil; +import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.*; +import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolTeamService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.async.Async; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCalendarController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCalendarController.java index d25e452..d53927a 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCalendarController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCalendarController.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.activity.controller.school; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java index 3134192..7d70512 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java @@ -2,23 +2,23 @@ package io.v.nutz.zhgh.activity.controller.school; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.hutool.core.util.StrUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import io.v.nutz.zhgh.activity.models.*; -import io.v.nutz.zhgh.activity.services.ActivityPlanService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.OfficeTemplateUtil; -import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.DateUtil; +import io.v.nutz.base.utils.OfficeTemplateUtil; import io.v.nutz.sys.models.Sys_union; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysUnionService; +import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.*; +import io.v.nutz.zhgh.activity.services.ActivityPlanService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.nutz.dao.Cnd; @@ -29,6 +29,7 @@ import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; +import org.nutz.lang.Lang; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; @@ -36,10 +37,14 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletResponse; +import java.io.BufferedOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * @author: Aaron @@ -163,7 +168,7 @@ public class ActivityCommonController { */ @At @ViReturn - public Object getSchoolActivityPlan(@Param(value = "type",required = false) Integer type) { + public Object getSchoolActivityPlan(@Param(value = "type", required = false) Integer type) { return activityPlanService.listMap(Sqls.create("select * from activity_plan where type = @type").setParam("type", type)); } @@ -350,191 +355,66 @@ public class ActivityCommonController { @At @Ok("void") - public void export(String id, String unionId, HttpServletResponse response) throws IOException { - ActivitySchool activity = activitySchoolService.fetch(id); + public void export(String id, String unionId, HttpServletResponse response) { + try { + ActivitySchool activity = activitySchoolService.fetch(id); + String fileName = Globals.MyConfig.getString("GxName") + activity.getName() + "报名表"; + response.addHeader("Content-Type", "application/octet-stream"); + response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1) + "\".zip"); - Map map = new HashMap(); - List list = new ArrayList(); + List basicUnions = activitySchoolService.dao().query(ActivityBasicUnion.class, Cnd.NEW().asc("unioncode")); + ZipOutputStream zipOutputStream = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream())); + for (ActivityBasicUnion union : basicUnions) { + NutMap map = new NutMap(); + map.setv("unionName", union.getUnionname()); - CndPlus unionCnd = CndPlus.create(); - Sql sql = Sqls.create(""" - SELECT * FROM sys_union un $condition - """); + List schoolApplies = activitySchoolApplyService.query(Cnd.where("activityId", "=", id)); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { - if (ShiroUtil.hasRole("H04")) { - Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); - Sys_unit unit = user.getUnit(); - unionCnd.and("un.id", "=", unit.getUnionid()); - } - } else { - unionCnd.andEx("un.id", "=", unionId); - } - unionCnd.and(new Static("(SELECT count(1) from activity_school_apply app WHERE app.unionId = un.id and app.status = 2 and app.activityId='%s') > 0".formatted(id))); - sql.setCondition(unionCnd); - - List unions = sysUnionService.listEntity(sql); - CndPlus cnd = CndPlus.create(); - Sql sql1 = Sqls.create(""" - SELECT - ae.allName, - app.*, - team.`name` teamName, - unit.`name` unitName, - gh.unionname AS unionName - FROM - activity_school_apply app - LEFT JOIN activity_event ae ON ae.id = app.eventId - LEFT JOIN activity_school_team team ON app.teamId = team.id - LEFT JOIN sys_unit unit ON app.unitId = unit.id - LEFT JOIN sys_union gh ON gh.id = unit.unionid - $condition - """); - - cnd.andEx("app.activityId", "=", id); - cnd.andEx("app.unionId", "=", unionId); - - cnd.desc("app.divisionLevelLeadership").asc("team.location").asc("app.sex"); - - sql1.setCondition(cnd); - List applies = activitySchoolApplyService.listEntity(sql1, ActivitySchoolApply.class); - List mapList = activitySchoolApplyService.listMap(sql1); - - - for (NutMap apply : mapList) { - String oldUsername = apply.getString("username"); - String username = apply.getString("username"); - - String sex = apply.getString("sex"); - boolean unionHead = apply.getBoolean("unionHead"); - boolean coach = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("2")); - boolean leader = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("3")); - boolean substitute = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("5")); - boolean divisionLevelLeadership = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("4")); - - boolean women = "女".equals(sex); - - if (women || divisionLevelLeadership || coach || leader) { - username += "（"; - - if (women) { - username += "女 "; - } - if (coach && username.equals(oldUsername)) { - username += "教练 "; - } - if (leader && username.equals(oldUsername)) { - username += "领队 "; + List ydhUserList = schoolApplies.stream().filter(v -> v.getIdentity().contains("1")).collect(Collectors.toList()); + ActivitySchoolApply jlUser = schoolApplies.stream().filter(v -> v.getIdentity().contains("2")).findFirst().orElse(null); + ActivitySchoolApply ldUser = schoolApplies.stream().filter(v -> v.getIdentity().contains("3")).findFirst().orElse(null); + ydhUserList.stream().forEach(y -> y.setSf("队员")); + for (int i = 0; i < ydhUserList.size(); i++) { + ydhUserList.get(i).setSf("队员"); + ydhUserList.get(i).setIndex(i + 1); } - if (unionHead && username.equals(oldUsername)) { - username += "团长 "; + map.setv("headName", fileName); + if (Lang.isNotEmpty(ldUser)) { + map.setv("ldUserName", ldUser.getUsername()); + map.setv("ldMobile", ldUser.getMobile()); } - if (substitute && username.equals(oldUsername)) { - username += "替补 "; + if (Lang.isNotEmpty(jlUser)) { + map.setv("jlUserName", jlUser.getUsername()); } - if (divisionLevelLeadership && username.equals(oldUsername)) { - username += "处级领导 "; - } - username += "）"; - String subUserName = username.substring(0, username.length() - 2); - if (!women && subUserName.equals(oldUsername)) { - apply.setv("username", oldUsername); - } else { - apply.setv("username", username); - } -// apply.setv("username", (!women && username.equals(oldUsername)) ? oldUsername : username); + + map.setv("ydhUser", ydhUserList); + + map.setv("applyDate", DateUtil.getDate()); + + String twoFileName = union.getUnionname() + "比赛报名表.docx"; + zipOutputStream.putNextEntry(new ZipEntry(twoFileName)); + + HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); + Configure config = Configure.newBuilder().bind("ydhUser", policy).build(); + /* if (activity.getApplyType() == 1) { + templateUrl = officeTemplateUtil.getPath("activity_list1"); + } else if (activity.getApplyType() == 2) { + templateUrl = officeTemplateUtil.getPath("activity_list"); + }officeTemplateUtil.getPath("activity_user"); + */ + String officeTemplateUtilPath = officeTemplateUtil.getPath("activity_user"); + assert officeTemplateUtilPath != null; + XWPFTemplate.compile(officeTemplateUtilPath, config).render(map).write(zipOutputStream); + zipOutputStream.closeEntry(); } + zipOutputStream.flush(); + zipOutputStream.close(); + } catch (Exception e) { + e.printStackTrace(); } - for (Sys_union union : unions) { - String union_id = union.getId(); - - Map m = new HashMap<>(); - m.put("id", union_id); - m.put("name", union.getUnionname()); - - List users = mapList.stream().filter(v -> { - return v.getString("unionId").equals("2b113edb7e7d4494a9cdfd7672a0ed90"); - }).collect(Collectors.toList()); - - /* List users = mapList.stream().filter(v -> { - return v.getString("unionId").equals(union_id); - }).collect(Collectors.toList());*/ - - - List collect1 = users.stream().filter(v -> v.getString("team") != null).collect(Collectors.toList()); - - Map> allName = collect1.stream().collect(Collectors.groupingBy(all -> all.getString("allName"), Collectors.toList())); - - LinkedHashMap> collect = collect1.stream().filter(v -> { - return Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("1") || x.equals("2") || x.equals("3") || x.equals("4") || x.equals("5")); - }).collect(Collectors.groupingBy(record -> record.getString("team"), LinkedHashMap::new, Collectors.toList())); - - - List teams = new ArrayList(); - List leaderList = new ArrayList<>(); - collect.forEach((key, val) -> { - List ydy = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("1") || x.equals("5"))).collect(Collectors.toList()); - List coach = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("2"))).collect(Collectors.toList()); - List leader = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("3"))).collect(Collectors.toList()); - List divisionLevelLeadership = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("4"))).collect(Collectors.toList()); - - Map mm = new HashMap<>(); - mm.put("name", key); - mm.put("coach", coach); - mm.put("leader", leader); - mm.put("divisionLevelLeadership", divisionLevelLeadership); - mm.put("users", ydy); - if (key.equals("第1队") && leader.size() > 0) { - leaderList.add(leader.get(0)); - } - teams.add(mm); - }); - - m.put("id1", teams); - - if (activity.getApplyType() == 1) { - m.put("id3", leaderList); - } else { - //教练 - List id2 = users.stream().filter(v -> StrUtil.isNotBlank(v.getString("unionCoach")) && v.getBoolean("unionCoach")).collect(Collectors.toList()); - - m.put("id2", id2); - if (id2.size() > 0) m.put("coachName", "基层工会教练："); - - - //领队 - List id3 = users.stream().filter(v -> StrUtil.isNotBlank(v.getString("unionLeader")) && v.getBoolean("unionLeader")).collect(Collectors.toList()); - m.put("id3", id3); - if (id3.size() > 0) m.put("leaderName", "基层工会领队："); - - //领队 - List id4 = users.stream().filter(v -> StrUtil.isNotBlank(v.getString("unionHead")) && v.getBoolean("unionHead")).collect(Collectors.toList()); - m.put("id4", id4); - if (id4.size() > 0) m.put("unionHead", "基层工会团长："); - } - - list.add(m); - } - - map.put("list", list); - - String fileName = activity.getName() + "人员名单"; - response.addHeader("Content-Type", "application/octet-stream"); - response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1) + "\".docx"); - - HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); - Configure config = Configure.newBuilder().bind("users", policy).build(); - String templateUrl = ""; - if (activity.getApplyType() == 1) { - templateUrl = officeTemplateUtil.getPath("activity_list1"); - } else if (activity.getApplyType() == 2) { - templateUrl = officeTemplateUtil.getPath("activity_list"); - } - XWPFTemplate.compile(templateUrl, config).render(map).writeAndClose(response.getOutputStream());; - } @@ -548,7 +428,7 @@ public class ActivityCommonController { Cnd unionCnd = Cnd.NEW(); Sql sql = Sqls.create(""" - SELECT * FROM sys_union un $condition + SELECT * FROM sys_union un $condition """); if (!ShiroUtil.hasAnyRoles("sysadmin,A06") && ShiroUtil.hasRole("H04")) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityGradesController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityGradesController.java index fc9ae39..ae3ee0c 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityGradesController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityGradesController.java @@ -3,14 +3,14 @@ package io.v.nutz.zhgh.activity.controller.school; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.Vi; +import io.v.nutz.sys.services.SysUnitService; import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; import io.v.nutz.zhgh.activity.models.SchoolAssignGrades; import io.v.nutz.zhgh.activity.services.ActivitySchoolService; -import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.base.service.ViService; -import io.v.nutz.sys.services.SysUnitService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPlanController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPlanController.java index 1d8bd6b..ffd5dcb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPlanController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPlanController.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.activity.controller.school; -import io.v.nutz.zhgh.activity.models.ActivityPlan; -import io.v.nutz.zhgh.activity.services.ActivityPlanService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.activity.models.ActivityPlan; +import io.v.nutz.zhgh.activity.services.ActivityPlanService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.ioc.loader.annotation.Inject; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java index 7cae417..cc588b0 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.activity.controller.school; import cn.wizzer.framework.base.Result; -import io.v.nutz.zhgh.activity.models.ActivityResults; -import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.service.ViService; import io.v.nutz.sys.models.Sys_union; import io.v.nutz.sys.services.SysUnionService; +import io.v.nutz.zhgh.activity.models.ActivityResults; +import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; import lombok.Data; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java index ca900c0..63023bb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java @@ -6,19 +6,19 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.wizzer.framework.base.Result; -import io.v.nutz.sys.models.*; -import io.v.nutz.zhgh.activity.controller.school.constant.SchoolActivityApplyExportEntity; -import io.v.nutz.zhgh.activity.models.*; -import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.service.BaseService; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Vi; +import io.v.nutz.base.utils.ViTool; +import io.v.nutz.sys.models.*; import io.v.nutz.sys.services.SysClubService; import io.v.nutz.sys.services.SysUnionService; import io.v.nutz.web.commons.utils.ShiroUtil; -import io.v.nutz.base.utils.ViTool; +import io.v.nutz.zhgh.activity.controller.school.constant.SchoolActivityApplyExportEntity; +import io.v.nutz.zhgh.activity.models.*; +import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java index e2b4fd1..34fbbfb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java @@ -1,17 +1,17 @@ package io.v.nutz.zhgh.activity.controller.school; -import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; -import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.RCSCloudAPI; -import io.v.nutz.base.utils.Roles; -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.RCSCloudAPI; +import io.v.nutz.base.utils.Roles; +import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.services.SysUnionService; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; +import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; @@ -165,9 +165,9 @@ public class ActivityRemindController { public Object sendRemind(@Param(value = "phone", required = false) String phone, @Param(value = "unionname", required = false) String unionname) { String[] pe = phone.split(","); - /*for (String p : pe) { - RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", p, "@1@=" + unionname + "", ""); - }*/ + for (String p : pe) { +// RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", p, "@1@=" + unionname + "", ""); + } return null; } @@ -203,9 +203,9 @@ public class ActivityRemindController { return v.getInt("num") <= 0 && v.getString("telephone") != null; }).collect(Collectors.toList()); - /*collect.forEach(v -> { - RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", v.getString("telephone"), "@1@=" + v.getString("unionname") + "", ""); - });*/ + collect.forEach(v -> { +// RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", v.getString("telephone"), "@1@=" + v.getString("unionname") + "", ""); + }); return null; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java index 413c2b6..21ae911 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java @@ -1,17 +1,17 @@ package io.v.nutz.zhgh.activity.controller.school; import cn.wizzer.framework.base.Result; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.DateUtil; +import io.v.nutz.base.utils.Vi; +import io.v.nutz.sys.models.Sys_user; import io.v.nutz.zhgh.activity.models.ActivityBasicUnion; import io.v.nutz.zhgh.activity.models.ActivityBasicUnit; import io.v.nutz.zhgh.activity.models.ActivityResults; import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; -import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.DateUtil; -import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.base.query.PageForm; -import io.v.nutz.base.service.ViService; -import io.v.nutz.sys.models.Sys_user; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.crypto.hash.Sha256Hash; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReviewController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReviewController.java index 4219c7b..9ad82af 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReviewController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReviewController.java @@ -1,10 +1,10 @@ package io.v.nutz.zhgh.activity.controller.school; -import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; -import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; +import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; +import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java index 512bfc2..01d02f3 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java @@ -7,16 +7,16 @@ import cn.wizzer.framework.base.Result; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.OfficeTemplateUtil; +import io.v.nutz.base.utils.ViTool; +import io.v.nutz.sys.models.Sys_union; +import io.v.nutz.sys.services.SysUnionService; import io.v.nutz.zhgh.activity.models.ActivityResults; import io.v.nutz.zhgh.activity.models.ActivitySchool; import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; -import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.OfficeTemplateUtil; -import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.base.service.ViService; -import io.v.nutz.sys.models.Sys_union; -import io.v.nutz.sys.services.SysUnionService; -import io.v.nutz.base.utils.ViTool; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java index 623d85c..409555c 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java @@ -4,13 +4,13 @@ package io.v.nutz.zhgh.activity.controller.school; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import io.v.nutz.zhgh.activity.models.ActivitySchool; -import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; -import io.v.nutz.base.service.BaseService; import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.service.BaseService; +import io.v.nutz.base.utils.ViTool; import io.v.nutz.sys.models.Sys_union; import io.v.nutz.sys.services.SysUnionService; -import io.v.nutz.base.utils.ViTool; +import io.v.nutz.zhgh.activity.models.ActivitySchool; +import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteEquipmentController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteEquipmentController.java index ca4f811..6c6decc 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteEquipmentController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteEquipmentController.java @@ -2,9 +2,9 @@ package io.v.nutz.zhgh.activity.controller.site; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.result.Result; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.result.Result; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.zhgh.activity.models.ActivitySiteEquipment; import io.v.nutz.zhgh.activity.services.ActivitySiteEquipmentService; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java index cf3df4a..ccdd872 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java @@ -3,19 +3,16 @@ package io.v.nutz.zhgh.activity.controller.site; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.model.AuditState; import io.v.nutz.base.result.Result; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.model.AuditState; -import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.models.Sys_user_role; -import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivitySiteEquipment; import io.v.nutz.zhgh.activity.models.ActivitySiteInfo; import io.v.nutz.zhgh.activity.models.ActivitySiteReserve; @@ -39,9 +36,9 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; @IocBean @@ -133,7 +130,7 @@ public class SiteReserveApplyController { // String content = siteInfo.getName() + ",您有一条场地预约待审核，请您通过门户网站或点击详情登录智慧工会平台进行审核。," // + activitySiteReserve.getReserve_person_username(); -// //msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,auditLoginNameList,""); + msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,auditLoginNameList,""); } else { //离退休 祝鸿 审核 List auditLoginNameList = Lang.list("1019981325"); @@ -142,7 +139,7 @@ public class SiteReserveApplyController { String content = "离退休工作处的%s老师申请了一条%s的场地预约，请您通过门户网站或点击详情登录智慧工会平台进行审核" .formatted(ShiroUtil.getPrincipalProperty("username"), siteInfo.getName()); -// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,auditLoginNameList,""); + msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,auditLoginNameList,""); } return null; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java index 1fc59aa..def68ab 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java @@ -8,8 +8,8 @@ import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Audit; import io.v.nutz.base.page.Pagination; -import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.utils.MsgApi; import io.v.nutz.sys.services.SysUnitService; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.utils.ShiroUtil; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java index a056e28..eed970b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java @@ -9,7 +9,6 @@ import io.v.nutz.base.page.Pagination; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.BaseService; import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.base.utils.Vi; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivitySiteInfo; @@ -159,14 +158,14 @@ public class SiteRetireProcessController { .formatted(reserve_person, siteInfo.getName()); -// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,List.of("1019911404"),""); + msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,List.of("1019911404"),""); } else { //审核拒绝，发送短信给本人 String content = "%s老师您好！您预约的%s申请被离退休工作处处长拒绝，您可重新提交其他场地或时间段的申请" .formatted(reserve_person, siteInfo.getName()); System.out.println(content); -// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】","","text",content,List.of(reserve_person_login_name),""); + msgApi.sendWxMsg("智慧工会【场地预约（离退休）】","","text",content,List.of(reserve_person_login_name),""); } return null; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java index 717b380..91e9680 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java @@ -4,13 +4,13 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.page.Pagination; -import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.model.Audit; +import io.v.nutz.base.page.Pagination; import io.v.nutz.base.query.PageForm; -import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.base.utils.MsgApi; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivitySiteInfo; import io.v.nutz.zhgh.activity.models.ActivitySiteReserve; import io.v.nutz.zhgh.activity.services.SiteReserveService; @@ -157,13 +157,13 @@ public class SiteReviewController { String content = "%s老师您好！您预约的%s申请已通过审批，祝您使用愉快！" .formatted(reserve_person, siteInfo.getName()); - ////msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); + msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); } else { //审核拒绝，发送短信给本人 String content = "%s老师您好！您预约的%s申请被校工会拒绝，您可重新提交其他场地或时间段的申请" .formatted(reserve_person, siteInfo.getName()); - ////msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); + msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); } return null; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java index 158b240..0133f59 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java @@ -3,15 +3,15 @@ package io.v.nutz.zhgh.activity.controller.site; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.model.Audit; import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.BaseService; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.base.model.Audit; -import io.v.nutz.base.query.PageForm; -import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivitySiteInfo; import io.v.nutz.zhgh.activity.models.ActivitySiteReserve; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -151,14 +151,14 @@ public class SiteUnionProcessController { reserve_person, siteInfo.getName()); - ////msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),""); + msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),""); } else { //审核拒绝，发送短信给本人 String content = "%s老师您好！您预约的%s申请被分工会拒绝，您可重新提交其他场地或时间段的申请" .formatted(reserve_person, siteInfo.getName()); System.out.println(content); - ////msgApi.sendWxMsg("智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); + msgApi.sendWxMsg("智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),""); } return null; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/test.java b/src/main/java/io/v/nutz/zhgh/activity/controller/test.java deleted file mode 100644 index d9ea773..0000000 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/test.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.v.nutz.zhgh.activity.controller; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.EncodeHintType; -import com.google.zxing.MultiFormatWriter; -import com.google.zxing.WriterException; -import com.google.zxing.client.j2se.MatrixToImageWriter; -import com.google.zxing.common.BitMatrix; - -import javax.imageio.ImageIO; -import javax.swing.*; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -/** - * @version 1.0 - * @Author zzr - * @name：test - * @Date 2024/7/3 10:53 - * @注释 - */ -public class test extends JFrame { - - public test() { - setTitle("QR Code Example"); - setSize(400, 400); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setLocationRelativeTo(null); - } - - @Override - public void paint(Graphics g) { - super.paint(g); - Graphics2D g2d = (Graphics2D) g; - - // 设置抗锯齿 - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - - // 绘制文本 - g2d.drawString("添加企业微信与我联系", 50, 50); - - // 绘制图像 - try { - BufferedImage image = ImageIO.read(new File("C:/temp/01.jpg")); - g2d.drawImage(image, 50, 100, this); - } catch (IOException e) { - e.printStackTrace(); - } - - // 生成二维码 - String qrCodeText = "https://www.baidu.com"; - Map hints = new HashMap<>(); - hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); - BitMatrix bitMatrix = null; - try { - bitMatrix = new MultiFormatWriter().encode(qrCodeText, BarcodeFormat.QR_CODE, 200, 200, hints); - } catch (WriterException e) { - e.printStackTrace(); - } - - // 将二维码转换为BufferedImage - BufferedImage qrCodeImage = MatrixToImageWriter.toBufferedImage(bitMatrix); - - // 绘制二维码 - g2d.drawImage(qrCodeImage, 50, 200, this); - } - - public static void main(String[] args) { - test frame = new test(); - frame.setVisible(true); - } -} diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityAuditController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityAuditController.java index 86158b9..33de07e 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityAuditController.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.activity.controller.union; import cn.hutool.core.util.StrUtil; -import io.v.nutz.zhgh.activity.models.ActivityTissue; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.service.BaseService; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.model.Audit; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.service.BaseService; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityTissue; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyController.java index 8bb8a2c..cb302e5 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyController.java @@ -2,9 +2,9 @@ package io.v.nutz.zhgh.activity.controller.union; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.service.BaseService; -import io.v.nutz.zhgh.activity.models.ActivityTissue; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.service.SimpleService; +import io.v.nutz.zhgh.activity.models.ActivityTissue; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; 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 d0de228..679f44d 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 @@ -7,20 +7,21 @@ import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.result.Result; -import io.v.nutz.base.utils.*; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +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_user; +import io.v.nutz.sys.services.SysMsgService; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivityTissue; import io.v.nutz.zhgh.activity.models.ActivityTissuePerson; -import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.zhgh.activity.services.ActivityTissueService; import io.v.nutz.zhgh.mobileHome.service.MobileHomeService; -import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.sys.services.SysMsgService; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresAuthentication; @@ -47,7 +48,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * @author: Aaron @@ -77,9 +77,6 @@ public class ActivityUnionManageController { @Inject private SysMsgService sysMsgService; - @Inject - private MsgApi msgApi; - @Inject("ActivityTissuePerson") private ViService tissuePersonService; @@ -178,9 +175,9 @@ public class ActivityUnionManageController { }); tissue.getCover(); -// if (tissue.getIsPushHome()!=0) { -// mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome()); -// } + if (tissue.getIsPushHome()!=0) { + mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome()); + } activityTissueService.insertWith(tissue, "tissuePersonList"); activitySchoolService.dao().insert(tissue.getGoods()); @@ -323,36 +320,4 @@ public class ActivityUnionManageController { activityTissueService.update(Chain.make("isDisabled", "1".equals(isDisabled)), Cnd.where("id", "=", id)); return null; } - - - /** - * 活动发送短信 - * @param activityId - * @param groupId - * @param msgUrl - * @return - */ - @At - @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR) - public Object doSendMsg(String activityId,String groupId,String msgUrl){ - ActivityTissue activityTissue = sysUserService.dao().fetch(ActivityTissue.class, Cnd.where("id", "=", activityId)); - List userScopeList = sysUserService.dao().query(ActivityUserScope.class, Cnd.where("groupId", "=", groupId)); - List userIds = userScopeList.stream().map(ActivityUserScope::getUserId).collect(Collectors.toList()); - - List users = sysUserService.query(Cnd.where("id", "in", userIds)); - - List userLoginNameList = users.stream().map(Sys_user::getLoginname).collect(Collectors.toList()); - -// //msgApi.sendWxMsg("会议通知", "", "text", "常熟理工学院五届二次教代会会议通知\\查看更多", List.of("17386049197")); - - String msgText = ShiroUtil.getPrincipalProperty("username") + "邀请您参加【" + activityTissue.getName() + "】活动，请您点击卡片跳转至活动报名页"; - try { - ////msgApi.sendWxMsg("智慧工会【活动管理】", msgUrl, "textcard", msgText, userLoginNameList, ""); - return Result.success(); - } catch (Exception e){ - e.printStackTrace(); - return Result.error(); - } - } - } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java index 711ee62..67e25f8 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.activity.controller.union; -import io.v.nutz.zhgh.activity.models.ActivityPlan; -import io.v.nutz.zhgh.activity.services.ActivityPlanService; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.utils.Vi; +import io.v.nutz.zhgh.activity.models.ActivityPlan; +import io.v.nutz.zhgh.activity.services.ActivityPlanService; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.ioc.loader.annotation.Inject; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java index e519aaa..9ea113b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java @@ -64,6 +64,7 @@ public class ActivityUnionUserStatisticsController { @Param(value = "type", required = false) Integer type, @Param(value = "activityId", required = false) String activityId, @Param(value = "unionId", required = false) String unionId) { + ActivityTissue tissue = baseService.dao().fetch(ActivityTissue.class, activityId); Sql sql = Sqls.create(""" SELECT @@ -74,6 +75,8 @@ public class ActivityUnionUserStatisticsController { u.unionname, u.sex, u.mobile, + atp.applyUserId, + atp.id atpId , atp.applyDateTime FROM `activity_tissue_person` atp @@ -84,10 +87,12 @@ public class ActivityUnionUserStatisticsController { cnd.and("atp.tissueId", "=", activityId); cnd.andEX("u.unionId", "=", unionId); if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { - if (type == 40002) { - cnd.and("unionId", "=", Vi.getUnionId()); - } else if (type == 40003) { - cnd.and("atp.id", "in", " SELECT userid FROM sys_club_user WHERE clubid = '%s' ".formatted(vi.getClubId())); + if (!tissue.getUserId().equals(ShiroUtil.getUserId())) { + if (type == 40002) { + cnd.and("unionId", "=", Vi.getUnionId()); + } else if (type == 40003) { + cnd.and("u.id", "in", " SELECT userid FROM sys_club_user WHERE clubid = '%s' ".formatted(vi.getClubId())); + } } } if (Strings.isNotBlank(page.getSearchName()) && Strings.isNotBlank(page.getSearchKeyword())) { @@ -108,7 +113,11 @@ public class ActivityUnionUserStatisticsController { @RequiresPermissions(value = {"activity.school.user.statistics", "activity.club.user.statistics", "activity.union.user.statistics"}, logical = Logical.OR) public Object getActivityByYearOrType(@Param(value = "year", required = false) Integer year, @Param(value = "type", required = false) Integer type) { - return baseService.dao().query(ActivityTissue.class, Cnd.where("type", "=", type).andEX("YEAR(startTime)", "=", year).desc("startTime")); + Cnd cnd = Cnd.NEW(); + cnd.and("type", "=", type); + cnd.andEX("YEAR(startTime)", "=", year); + cnd.desc("startTime"); + return baseService.dao().query(ActivityTissue.class, cnd); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java index 3f1a27c..1f41090 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java @@ -3,12 +3,12 @@ package io.v.nutz.zhgh.activity.controller.union; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.base.service.BaseService; -import io.v.nutz.zhgh.activity.models.ActivityYearSummary; -import io.v.nutz.zhgh.activity.services.ActivityYearSummaryService; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityYearSummary; +import io.v.nutz.zhgh.activity.services.ActivityYearSummaryService; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.boot.starter.ftp.FtpService; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java index 8673696..0d9142b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java @@ -184,6 +184,7 @@ public class ActivitySchoolApply implements Serializable { @Excel(name = "身份", width = 40) private String sf; private int age; + private int index; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityBasicScopeService.java b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityBasicScopeService.java index 1ed5c2b..12a0b67 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityBasicScopeService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityBasicScopeService.java @@ -1,7 +1,7 @@ package io.v.nutz.zhgh.activity.services; -import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivityUserScope; import org.nutz.dao.Cnd; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityPlanService.java b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityPlanService.java index e1f8c47..54302a7 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityPlanService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityPlanService.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.activity.services; -import io.v.nutz.zhgh.activity.models.ActivityPlan; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivityPlan; /** * @author: Aaron diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolApplyService.java b/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolApplyService.java index 5ebce1b..85a7196 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolApplyService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolApplyService.java @@ -1,7 +1,7 @@ package io.v.nutz.zhgh.activity.services; -import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; import java.util.List; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolService.java b/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolService.java index c75bee3..a173856 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolService.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.activity.services; +import io.v.nutz.base.service.ViService; import io.v.nutz.zhgh.activity.models.ActivitySchool; import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent; -import io.v.nutz.base.service.ViService; /** * @author Aaron diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTissueService.java b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTissueService.java index ca72fa4..c700060 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTissueService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTissueService.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.activity.services; -import io.v.nutz.zhgh.activity.models.ActivityTissue; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivityTissue; /** * @author: Aaron diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTypeService.java b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTypeService.java index 8b113ef..0d9a7d7 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTypeService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityTypeService.java @@ -1,7 +1,7 @@ package io.v.nutz.zhgh.activity.services; -import io.v.nutz.zhgh.activity.models.ActivityType; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivityType; /** * 会议类型 流程 service diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityYearSummaryService.java b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityYearSummaryService.java index 3d5bc24..004da27 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/ActivityYearSummaryService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/ActivityYearSummaryService.java @@ -1,7 +1,7 @@ package io.v.nutz.zhgh.activity.services; -import io.v.nutz.zhgh.activity.models.ActivityYearSummary; import io.v.nutz.base.service.ViService; +import io.v.nutz.zhgh.activity.models.ActivityYearSummary; /** * @Author JyuHsin diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/SiteReserveService.java b/src/main/java/io/v/nutz/zhgh/activity/services/SiteReserveService.java index 4a71f00..93dbe37 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/SiteReserveService.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/SiteReserveService.java @@ -1,11 +1,8 @@ package io.v.nutz.zhgh.activity.services; -import io.v.nutz.zhgh.activity.models.ActivitySiteReserve; import io.v.nutz.base.service.BaseService; +import io.v.nutz.zhgh.activity.models.ActivitySiteReserve; public interface SiteReserveService extends BaseService { - - - String getTimeStr(String time); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityBasicScopeServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityBasicScopeServiceImpl.java index e364afc..dede6d2 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityBasicScopeServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityBasicScopeServiceImpl.java @@ -1,10 +1,10 @@ package io.v.nutz.zhgh.activity.services.impl; import cn.hutool.core.collection.CollectionUtil; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.base.utils.DateUtil; import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.activity.services.ActivityBasicScopeService; -import io.v.nutz.base.utils.DateUtil; -import io.v.nutz.base.service.impl.ViServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityCommonServiceImpl.java index 7d58ebc..9821378 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityCommonServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityCommonServiceImpl.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.activity.services.impl; -import io.v.nutz.zhgh.activity.models.ActivitySiteInfo; -import io.v.nutz.zhgh.activity.models.ActivityType; -import io.v.nutz.zhgh.activity.services.ActivityCommonService; -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.enums.AuditTypeEnum; import io.v.nutz.base.model.AuditState; import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.base.utils.Vi; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivitySiteInfo; +import io.v.nutz.zhgh.activity.models.ActivityType; +import io.v.nutz.zhgh.activity.services.ActivityCommonService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java index ee0cc3f..16409b8 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java @@ -1,12 +1,12 @@ package io.v.nutz.zhgh.activity.services.impl; -import io.v.nutz.zhgh.activity.models.ActivityPlan; -import io.v.nutz.zhgh.activity.services.ActivityPlanService; -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; 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.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityPlan; +import io.v.nutz.zhgh.activity.services.ActivityPlanService; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolApplyServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolApplyServiceImpl.java index 7a501e7..549ca31 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolApplyServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolApplyServiceImpl.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.activity.services.impl; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.zhgh.activity.models.ActivitySchoolApply; import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; -import io.v.nutz.base.service.impl.ViServiceImpl; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolServiceImpl.java index 8e9a7ad..5aaa74b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolServiceImpl.java @@ -1,13 +1,13 @@ package io.v.nutz.zhgh.activity.services.impl; +import io.v.nutz.base.service.ViService; +import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.base.utils.DateUtil; import io.v.nutz.zhgh.activity.models.*; import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService; import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import io.v.nutz.zhgh.activity.services.ActivitySchoolTeamService; -import io.v.nutz.base.utils.DateUtil; -import io.v.nutz.base.service.ViService; -import io.v.nutz.base.service.impl.ViServiceImpl; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; 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 9f384e9..fb5aa2e 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 @@ -1,18 +1,18 @@ package io.v.nutz.zhgh.activity.services.impl; import cn.hutool.core.util.StrUtil; -import io.v.nutz.base.model.Goods; -import io.v.nutz.zhgh.activity.models.ActivityTissue; -import io.v.nutz.zhgh.activity.models.ActivityTissuePerson; -import io.v.nutz.zhgh.activity.services.ActivityTissueService; -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.zhgh.jf.model.ActivityBx; import io.v.nutz.base.model.Audit; +import io.v.nutz.base.model.Goods; 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.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityTissue; +import io.v.nutz.zhgh.activity.models.ActivityTissuePerson; +import io.v.nutz.zhgh.activity.services.ActivityTissueService; +import io.v.nutz.zhgh.jf.model.ActivityBx; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; @@ -76,11 +76,12 @@ public class ActivityTissueServiceImpl extends ViServiceImpl imp } if (!ShiroUtil.hasAnyRoles("sysadmin,H10,A06")) { - if (ShiroUtil.hasRole("H04")) { + cnd.and("tissue.userId", "=", ShiroUtil.getUserId()); + /* if (ShiroUtil.hasRole("H04")) { cnd.and("tissue.unionId", "in", vi.getMangeUnionStr()); } else if (ShiroUtil.hasRole("club01")) { cnd.and("tissue.clubId", "in", vi.getMangeClubStr()); - } + }*/ } if (StrUtil.isNotBlank(page.getPageOrderName()) && StrUtil.isNotBlank(page.getPageOrderBy())) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTypeServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTypeServiceImpl.java index 22f549e..6ce36fb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTypeServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTypeServiceImpl.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.activity.services.impl; -import io.v.nutz.zhgh.activity.models.ActivityType; -import io.v.nutz.zhgh.activity.services.ActivityCommonService; -import io.v.nutz.zhgh.activity.services.ActivityTypeService; import io.v.nutz.base.model.AuditState; import io.v.nutz.base.model.AuditStateUser; import io.v.nutz.base.service.impl.ViServiceImpl; +import io.v.nutz.zhgh.activity.models.ActivityType; +import io.v.nutz.zhgh.activity.services.ActivityCommonService; +import io.v.nutz.zhgh.activity.services.ActivityTypeService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityYearSummaryServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityYearSummaryServiceImpl.java index 8a6076f..c65f57c 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityYearSummaryServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityYearSummaryServiceImpl.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.activity.services.impl; +import io.v.nutz.base.service.impl.ViServiceImpl; import io.v.nutz.zhgh.activity.models.ActivityYearSummary; import io.v.nutz.zhgh.activity.services.ActivityYearSummaryService; -import io.v.nutz.base.service.impl.ViServiceImpl; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/SiteReserveServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/SiteReserveServiceImpl.java index eba33e0..910db91 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/SiteReserveServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/SiteReserveServiceImpl.java @@ -1,15 +1,12 @@ package io.v.nutz.zhgh.activity.services.impl; +import io.v.nutz.base.service.impl.BaseServiceImpl; import io.v.nutz.zhgh.activity.models.ActivitySiteReserve; import io.v.nutz.zhgh.activity.services.SiteReserveService; -import io.v.nutz.base.service.impl.BaseServiceImpl; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - /** * @author: Aaron * @create: 2020-12-13 14:32 @@ -20,15 +17,4 @@ public class SiteReserveServiceImpl extends BaseServiceImpl public SiteReserveServiceImpl(Dao dao) { super(dao); } - - - @Override - public String getTimeStr(String time) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 解析字符串为LocalDateTime对象 - LocalDateTime dateTime = LocalDateTime.parse(time, formatter); - // 只包含时分的格式化器 - DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm"); - return dateTime.toLocalTime().format(timeFormatter); - } } diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateApplyController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateApplyController.java index 663b625..a215df3 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateApplyController.java @@ -1,23 +1,19 @@ package io.v.nutz.zhgh.evaluate.controller; +import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.result.Result; import io.v.nutz.base.utils.DateUtil; -import io.v.nutz.base.utils.Roles; - -import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.sys.models.Sys_union; +import io.v.nutz.sys.services.SysUnionService; +import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler; import io.v.nutz.zhgh.evaluate.models.Evaluate; import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import io.v.nutz.zhgh.evaluate.service.EvaluateApplyService; -import io.v.nutz.base.query.PageForm; -import io.v.nutz.sys.models.Sys_union; -import io.v.nutz.sys.models.Sys_unit; -import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.sys.services.SysUnionService; -import io.v.nutz.web.commons.slog.annotation.SLog; -import io.v.nutz.web.commons.utils.ShiroUtil; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; @@ -25,15 +21,14 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Strings; -import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; -import org.nutz.trans.Trans; import java.util.List; import java.util.Map; @@ -98,6 +93,12 @@ public class EvaluateApplyController { if (Strings.isNotBlank(evaluateApply.getId())) { evaluateApplyService.updateIgnoreNull(evaluateApply); } else { + //判断有没有申请过 + SqlExpressionGroup group = Cnd.exps("userId", "=", ShiroUtil.getPlatformUid()).or("userId", "=", ShiroUtil.getPlatformUsername()); + int count = evaluateApplyService.count(Cnd.NEW().and("evaluateId", "=", evaluateApply.getEvaluateId()).and(group)); + if(count > 0) { + return cn.wizzer.framework.base.Result.error("抱歉，您已申请过此评优评先，无法提交"); + } evaluateApply.setApplyTime(DateUtil.getDate()); evaluateApply.setStateId(1400); evaluateApplyService.insert(evaluateApply); @@ -112,6 +113,7 @@ public class EvaluateApplyController { @RequiresPermissions("evaluate.apply") @SLog(tag = "申请评优评先新增、修改", param = true, result = true) public Object doSubmit(EvaluateApply evaluateApply) { + evaluateApply.setUserId(ShiroUtil.getPrincipalProperty("id").toString()); if (!"8a8b455b964a41f2bbf18a4896cbd83e".equals(evaluateApply.getHonorTypeId())) { @@ -129,6 +131,20 @@ public class EvaluateApplyController { evaluateApply.setSchoolAuditId(null); evaluateApplyService.update(evaluateApply); } else { + //判断时间有没有过 + Evaluate eva = evaluateApplyService.dao().fetch(Evaluate.class, evaluateApply.getEvaluateId()); + DateTime currentTime = cn.hutool.core.date.DateUtil.date(); + DateTime targetTimeStr = cn.hutool.core.date.DateUtil.parse(eva.getEndTime()); + + if(cn.hutool.core.date.DateUtil.compare(currentTime, targetTimeStr) > 0) { + return cn.wizzer.framework.base.Result.error("抱歉，申请时间已过，无法提交"); + } + //判断有没有申请过 + SqlExpressionGroup group = Cnd.exps("userId", "=", ShiroUtil.getPlatformUid()).or("userId", "=", ShiroUtil.getPlatformUsername()); + int count = evaluateApplyService.count(Cnd.NEW().and("evaluateId", "=", evaluateApply.getEvaluateId()).and(group)); + if(count > 0) { + return cn.wizzer.framework.base.Result.error("抱歉，您已申请过此评优评先，无法提交"); + } evaluateApply.setApplyTime(DateUtil.getDate()); evaluateApply.setStateId("8a8b455b964a41f2bbf18a4896cbd83e".equals(evaluateApply.getHonorTypeId()) ? 1600 : 1800); evaluateApplyService.insert(evaluateApply); diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateController.java index 99d9ee5..20682cb 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateController.java @@ -3,14 +3,14 @@ package io.v.nutz.zhgh.evaluate.controller; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.Vi; +import io.v.nutz.sys.services.SysMsgService; +import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.evaluate.models.Evaluate; import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import io.v.nutz.zhgh.evaluate.service.EvaluateService; -import io.v.nutz.base.query.PageForm; -import io.v.nutz.sys.services.SysMsgService; -import io.v.nutz.web.commons.utils.ShiroUtil; -import io.v.nutz.web.commons.slog.annotation.SLog; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluatePartyAuditController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluatePartyAuditController.java index 7b5143d..7a1d740 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluatePartyAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluatePartyAuditController.java @@ -2,18 +2,17 @@ package io.v.nutz.zhgh.evaluate.controller; import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.Roles; - -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.zhgh.evaluate.models.Evaluate; -import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import io.v.nutz.base.model.Audit; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.Roles; +import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.evaluate.models.Evaluate; +import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; @@ -45,7 +44,7 @@ public class EvaluatePartyAuditController { @Inject private Dao dao; - + @At("") @RequiresPermissions("evaluate.audit.party") diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSchoolAuditController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSchoolAuditController.java index 94a8eb7..8a54d49 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSchoolAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSchoolAuditController.java @@ -5,24 +5,23 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; - -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler; -import io.v.nutz.zhgh.evaluate.models.Evaluate; -import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import io.v.nutz.base.model.Audit; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.Vi; +import io.v.nutz.base.utils.ViTool; import io.v.nutz.sys.models.Sys_file; import io.v.nutz.sys.models.Sys_union; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysUnionService; import io.v.nutz.sys.services.SysUserService; -import io.v.nutz.web.commons.utils.ShiroUtil; -import io.v.nutz.base.utils.ViTool; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.FileUtil; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler; +import io.v.nutz.zhgh.evaluate.models.Evaluate; +import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -208,6 +207,7 @@ public class EvaluateSchoolAuditController { } @At + @Ok("void") @RequiresPermissions("evaluate.audit.school") public void exportTableData(String data, HttpServletResponse response) { NutMap map = Json.fromJson(NutMap.class, data); diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSummaryController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSummaryController.java index 30c7d40..df5a21c 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSummaryController.java @@ -5,14 +5,13 @@ import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.OfficeTemplateUtil; -import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.OfficeTemplateUtil; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.web.commons.utils.ShiroUtil; -import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; @@ -26,7 +25,6 @@ import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -64,14 +62,14 @@ public class EvaluateSummaryController { @Param(value = "unitId", required = false) String unitId, @Param(value = "honorType", required = false) String honorType, @Param(value = "evaluateId", required = false) String evaluateId) { - CndPlus cnd = CndPlus.create(); + Cnd cnd = Cnd.NEW(); Sql sql = Sqls.create(""" SELECT ea.*, e.NAME AS evaluateName, unit.NAME AS unitName, - us.userName + us.userName as userName FROM evaluate_apply ea LEFT JOIN evaluate e ON e.id = ea.evaluateId @@ -81,11 +79,11 @@ public class EvaluateSummaryController { $condition """); - cnd.andEx("ea.evaluateId", "=", evaluateId); - cnd.andEx("YEAR(ea.applyTime)", "=", year); - cnd.andEx("ea.unionid", "=", unionId); - cnd.andEx("us.unitid", "=", unitId); - cnd.andEx("ea.honorTypeId", "=", honorType); + cnd.andEX("ea.evaluateId", "=", evaluateId); + cnd.andEX("YEAR(ea.applyTime)", "=", year); + cnd.andEX("ea.unionid", "=", unionId); + cnd.andEX("us.unitid", "=", unitId); + cnd.andEX("ea.honorTypeId", "=", honorType); if(!ShiroUtil.hasAnyRoles("sysadmin") || ShiroUtil.hasAnyRoles("H10")) { cnd.and("e.userid", "=", ShiroUtil.getPrincipalProperty("id")); diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java index 0247985..5e8b81c 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java @@ -2,20 +2,17 @@ package io.v.nutz.zhgh.evaluate.controller; import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.Roles; - -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler; -import io.v.nutz.zhgh.evaluate.models.Evaluate; -import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import io.v.nutz.base.model.Audit; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; -import io.v.nutz.sys.models.Sys_union; +import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler; +import io.v.nutz.zhgh.evaluate.models.Evaluate; +import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; @@ -26,13 +23,10 @@ import org.nutz.dao.sql.Sql; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; -import java.util.List; - /** * @author zhf * @date 2021/11/19 14:36 @@ -156,7 +150,7 @@ public class EvaluateUnionAuditController { // //sendMsg.pushWeChatMsg("评优评先", msg, map.getString("loginname")); // } // } else { -// String msg = "%s老师您好，您于%s申请的【%s】评优评先，在分工会审核时被驳回！" +// String msg = "%s老师您好，您于%s申请的【%s】评优评先，在院级工会审核时被驳回！" // .formatted(applyUser.getUsername(), evaluateApply.getApplyTime(), evaluate.getName()); // //sendMsg.pushWeChatMsg("评优评先", msg, applyUser.getLoginname()); // } @@ -181,7 +175,7 @@ public class EvaluateUnionAuditController { //回到初始状态，审核记录可以不用清除，让申请人能看到是因为什么原因退回 evaluateApplyViService.update(Chain.make("stateId", 1400).add("unionAuditId", audit.getId()), Cnd.where("id", "=", id)); //退回发短信 - String msg = "%s老师您好，您于%s申请的【%s】评优评先，在分工会审核时被退回！" + String msg = "%s老师您好，您于%s申请的【%s】评优评先，在院级工会审核时被退回！" .formatted(applyUser.getUsername(), evaluateApply.getApplyTime(), evaluate.getName()); //sendMsg.pushWeChatMsg("评优评先", msg, applyUser.getLoginname()); diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnitAuditController.java b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnitAuditController.java index 3b8ab9c..9355b02 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnitAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnitAuditController.java @@ -2,20 +2,19 @@ package io.v.nutz.zhgh.evaluate.controller; import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.Roles; - -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; -import io.v.nutz.zhgh.evaluate.models.Evaluate; -import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import io.v.nutz.base.model.Audit; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.ViService; +import io.v.nutz.base.utils.Roles; +import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_union; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.evaluate.models.Evaluate; +import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; @@ -47,7 +46,7 @@ public class EvaluateUnitAuditController { @Inject private Dao dao; - + @At("") @RequiresPermissions("evaluate.audit.unit") @@ -131,7 +130,7 @@ public class EvaluateUnitAuditController { $condition """); cndPlus.andEx("ur.roleId", "=", Roles.UNION_MANGER); - cndPlus.andEx("ur.unionId", "=", ((Sys_union) io.v.nutz.web.commons.utils.ShiroUtil.getPrincipalProperty("union")).getId()); + cndPlus.andEx("ur.unionId", "=", ((Sys_union) ShiroUtil.getPrincipalProperty("union")).getId()); sql.setCondition(cndPlus); List userList = evaluateApplyViService.listMap(sql); for (NutMap map : userList) { diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java b/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java index 4309d69..744c7f3 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java @@ -7,8 +7,6 @@ import io.v.nutz.sys.services.impl.SysLocalProcessServiceImpl; import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.evaluate.models.EvaluateApply; -import io.v.nutz.zhgh.medicalMutualAidFund.constant.MedicalMutualAidFundAuditStateConstant; -import io.v.nutz.zhgh.medicalMutualAidFund.model.MedicalMutualAidFund; import lombok.Getter; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -25,7 +23,7 @@ public enum EvaluateToDoHandler { START_PROCESS() { @Override public void exec(EvaluateApply e) { - Sql sql = Sqls.fetchString(Sqls.create("select username from sys_user where id = @id").setParam("userId", e.getUserId()).toString()); + Sql sql = Sqls.fetchString(Sqls.create("select username from sys_user where id = @id").setParam("id", e.getUserId()).toString()); dao.execute(sql); String username = sql.getString(); @@ -34,8 +32,8 @@ public enum EvaluateToDoHandler { "evaluate_apply@" + e.getId(), "", e.getUserId(), - Globals.AppDomain + "/platform/fw/difficulty/applylist", - Globals.AppDomain + "/platform/fw/difficulty/applylist" + Globals.AppDomain + "/platform/evaluate/apply", + Globals.AppDomain + "/platform/evaluate/apply" ); } @@ -120,7 +118,7 @@ public enum EvaluateToDoHandler { "/platform/evaluate/audit/union" ); - localProcessService.updateProcessNodeName("medical_mutual_aid_fund@" + e.getId(), "分工会审核"); + localProcessService.updateProcessNodeName("evaluate_apply@" + e.getId(), "分工会审核"); } }, diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateApplyService.java b/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateApplyService.java index 59853bd..3215cbe 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateApplyService.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateApplyService.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.evaluate.service; import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.BaseService; import io.v.nutz.zhgh.evaluate.models.EvaluateApply; -import io.v.nutz.base.query.PageForm; import org.nutz.dao.Cnd; /** diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateService.java b/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateService.java index 727c653..959e210 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateService.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateService.java @@ -1,9 +1,9 @@ package io.v.nutz.zhgh.evaluate.service; import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.BaseService; import io.v.nutz.zhgh.evaluate.models.Evaluate; -import io.v.nutz.base.query.PageForm; import org.nutz.dao.Cnd; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java b/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java index 769a476..748be84 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java @@ -1,6 +1,8 @@ package io.v.nutz.zhgh.evaluate.service.impl; +import io.v.nutz.base.model.Audit; import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.result.Result; import io.v.nutz.base.service.impl.BaseServiceImpl; import io.v.nutz.base.utils.FileService; @@ -8,8 +10,6 @@ import io.v.nutz.base.utils.Vi; import io.v.nutz.zhgh.evaluate.models.Evaluate; import io.v.nutz.zhgh.evaluate.models.EvaluateApply; import io.v.nutz.zhgh.evaluate.service.EvaluateApplyService; -import io.v.nutz.base.model.Audit; -import io.v.nutz.base.query.PageForm; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceImpl.java b/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceImpl.java index 54122fd..123558d 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceImpl.java @@ -1,12 +1,12 @@ package io.v.nutz.zhgh.evaluate.service.impl; -import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.base.page.Pagination; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.impl.BaseServiceImpl; +import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.evaluate.models.Evaluate; import io.v.nutz.zhgh.evaluate.models.EvaluateQuotaAllocation; import io.v.nutz.zhgh.evaluate.service.EvaluateService; -import io.v.nutz.base.query.PageForm; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java index 8888e5b..ab87400 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java @@ -84,6 +84,7 @@ public class HealthCheckupListController { cnd.andEX("hcu.unitId", "=", unitId); cnd.andEX("hcu.unionGroupId", "=", unionGroupId); cnd.andEX("hcu.threeUnitId", "=", threeUnitId); + cnd.andEX("hcu.projectId","=",projectId); if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { cnd.andEX("hcu.unionId", "=", Vi.getUnionId()); diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java index 6e78a3f..50f77c6 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java @@ -184,9 +184,9 @@ public class HealthCheckupProjectMangeController { List userSelectionIds = list.stream().map(v->v.getString("id")).collect(Collectors.toList()); List userIds = list.stream().map(v -> v.getString("selectUserId")).collect(Collectors.toList()); + healthCheckupProjectService.dao().clear(HealthCheckupUser.class,Cnd.where("projectId","=",healthCheckupProject.getId())); healthCheckupProjectService.dao().clear(HealthCheckupUserSelection.class,Cnd.where("selectUserId","in",userIds)); healthCheckupProjectService.dao().clear(HealthCheckupUserCompanion.class,Cnd.where("userSelectionId","in",userSelectionIds)); - healthCheckupProjectService.dao().clear(HealthCheckupUser.class,Cnd.where("projectId","=",healthCheckupProject.getId())); healthCheckupProjectService.addHealthCheckupUser(healthCheckupProject); return null; } diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java index fb95889..a47f26b 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java @@ -36,11 +36,11 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl implements sql.setCallback(Sqls.callback.map()); dao().execute(sql); NutMap record = (NutMap) sql.getResult(); - record.setv("Goods", dao().query("Goods", Cnd.where("reid", "=", record.getString("id")))); + record.setv("Goods", dao().query(Goods.class, Cnd.where("reid", "=", record.getString("id")))); if (record.size() == 0) { return null; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java index 6b10768..04251cf 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java @@ -3,12 +3,12 @@ package io.v.nutz.zhgh.mobile.activity.site; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.enums.AuditTypeEnum; -import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.base.utils.Vi; import io.v.nutz.base.dao.CndPlus; +import io.v.nutz.base.enums.AuditTypeEnum; import io.v.nutz.base.model.Audit; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.utils.MsgApi; +import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.services.ActivityCommonService; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileApplyController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileApplyController.java index a1513dc..777bf07 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileApplyController.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.mobile.activity.site; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivitySiteReserve; import io.v.nutz.zhgh.activity.services.ActivitySchoolService; import org.apache.shiro.authz.annotation.RequiresAuthentication; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileController.java index 1f025ff..cfdf1aa 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileController.java @@ -3,8 +3,8 @@ package io.v.nutz.zhgh.mobile.activity.site; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.page.Pagination; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.utils.MsgApi; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivitySiteInfo; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityMineController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityMineController.java index 22cd394..3bbd721 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityMineController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityMineController.java @@ -1,11 +1,11 @@ package io.v.nutz.zhgh.mobile.activity.unionActivity; -import io.v.nutz.zhgh.activity.models.ActivityTissue; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.SimpleService; import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.query.PageForm; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityTissue; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; 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 6e53bce..f17461c 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 @@ -2,17 +2,17 @@ package io.v.nutz.zhgh.mobile.activity.unionActivity; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; -import io.v.nutz.zhgh.activity.models.ActivityTissue; -import io.v.nutz.zhgh.activity.models.ActivityTissuePerson; -import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.query.PageForm; import io.v.nutz.base.service.SimpleService; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Vi; -import io.v.nutz.base.query.PageForm; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.models.User; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityTissue; +import io.v.nutz.zhgh.activity.models.ActivityTissuePerson; +import io.v.nutz.zhgh.activity.models.ActivityUserScope; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; @@ -31,7 +31,6 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import org.nutz.trans.Trans; -import java.util.Date; import java.util.List; import java.util.Optional; import java.util.concurrent.locks.Lock; @@ -121,9 +120,9 @@ public class UnionActivityRegisterController { @ViReturn @RequiresAuthentication public Object pageData(PageForm pageForm, - @Param(value = "year",required = false) Integer year, - @Param(value = "activityStatus",required = false)int activityStatus, - @Param(value = "activityLevel",required = false)String activityLevel) { + @Param(value = "year", required = false) Integer year, + @Param(value = "activityStatus", required = false) int activityStatus, + @Param(value = "activityLevel", required = false) String activityLevel) { Sql sql = Sqls.create(""" SELECT id, @@ -164,7 +163,7 @@ public class UnionActivityRegisterController { allCnd.andEX("projectTypeCode", "!=", "50004"); allCnd.andEX("signUpMethod", "is not", null); allCnd.andEX("state", "=", 3); - allCnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId= ti.groupId AND userId='%s') >0".formatted(io.v.nutz.web.commons.utils.ShiroUtil.getUserId()))); + allCnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId= ti.groupId AND userId='%s') >0".formatted(ShiroUtil.getUserId()))); if (!ShiroUtil.hasAnyRoles(Lang.list("sysadmin", "A06"))) { if (ShiroUtil.hasRole("H04")) { allCnd.andEX("signUpMethod", "in", Lang.array(1, 2, 3)); @@ -177,7 +176,7 @@ public class UnionActivityRegisterController { YEAR ( startTime )= %s AND ( SELECT COUNT( 1 ) FROM activity_user_scope WHERE groupId = activityGroupId AND userId = '%s' ) > 0 AND JSON_CONTAINS(applyWay -> '$[*]','1','$' ) - """.formatted(year, io.v.nutz.web.commons.utils.ShiroUtil.getUserId())); + """.formatted(year, ShiroUtil.getUserId())); switch (activityStatus) { case 2 -> { allCnd.and(new Static("applyStartTime < now()")); @@ -195,12 +194,12 @@ public class UnionActivityRegisterController { sql.setVar("schoolTime", "AND endTime < now()"); } - case 5->{ + case 5 -> { allCnd.and(new Static("applyStartTime > now()")); sql.setVar("schoolTime", "AND applyStartTime > now()"); } } - allCnd.and("isDisabled","=",1); + allCnd.and("isDisabled", "=", 1); // allCnd.desc("endTime"); if (Strings.isNotBlank(activityLevel)) { sql.setVar("schoolLevel", "AND activityLevel='%s'".formatted(activityLevel)); @@ -496,9 +495,18 @@ public class UnionActivityRegisterController { @At @ViReturn @RequiresAuthentication - public Object doSingleCancelRegister(String activityId) { + public Object doSingleCancelRegister(String activityId, String applyUserId, String id) { + ActivityTissue tissue = simpleService.dao().fetch(ActivityTissue.class, activityId); + if (!tissue.isEnrollSystem()) { + simpleService.dao().delete(ActivityTissuePerson.class, id); + return Result.success().addMsg("取消成功！"); + } + + if (StrUtil.isBlank(applyUserId)) { + applyUserId = ShiroUtil.getPrincipalProperty("id").toString(); + } simpleService.dao().clear(ActivityTissuePerson.class, Cnd.where("tissueId", "=", activityId) - .and("userId", "=", ShiroUtil.getPrincipalProperty("id"))); + .and("applyUserId", "=", applyUserId)); return Result.success().addMsg("取消成功！"); } diff --git a/src/main/java/io/v/nutz/zhgh/mobile/healthCheckup/MHealthCheckupListController.java b/src/main/java/io/v/nutz/zhgh/mobile/healthCheckup/MHealthCheckupListController.java index 2dca135..9391c0d 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/healthCheckup/MHealthCheckupListController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/healthCheckup/MHealthCheckupListController.java @@ -60,7 +60,7 @@ public class MHealthCheckupListController { public Object pageData(PageForm pageForm, @Param(value = "tabName", required = false) String tabName) { Sql sql = Sqls.create(""" select - *, + p.*, (select count(*) from health_checkup_user_selection s where s.projectId=p.id and s.selectUserId=@userId) as selectCount from health_checkup_project p diff --git a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java index b5b90b4..11df7c4 100644 --- a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java +++ b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java @@ -80,13 +80,13 @@ public class ZgfwZcZhcxController { LEFT JOIN sys_union us ON us.id = xx.zclydwhid $condition """); - CndPlus cndPlus = CndPlus.create(); - cndPlus.andEx(searchName, "like", "%" + searchKeyword + "%"); - cndPlus.andEx("xx.zczt", "=", zczt); - cndPlus.andEx("xx.zcghlx", "=", zcghlx); - cndPlus.andEx("xx.zczt", "=", zczt); - cndPlus.andEx("xx.zcrksj", "=", zcrksj); - cndPlus.andEx("us.id", "=", ghid); + Cnd cndPlus = Cnd.NEW(); + cndPlus.andEX(searchName, "like", "%" + searchKeyword + "%"); + cndPlus.andEX("xx.zczt", "=", zczt); + cndPlus.andEX("xx.zcghlx", "=", zcghlx); + cndPlus.andEX("xx.zczt", "=", zczt); + cndPlus.andEX("xx.zcrksj", "=", zcrksj); + cndPlus.andEX("us.id", "=", ghid); if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) { cndPlus.orderBy(pageOrderName, pageOrderBy.equals("desc") ? "desc" : "asc"); } else { diff --git a/src/main/resources/docTemplate/funds2.docx b/src/main/resources/docTemplate/funds2.docx index 58960184fcf1201081ae51f9a22120f8b3ba99f9..bba1fdda629e435285de17147f2a1bae177b694e 100644 GIT binary patch delta 7405 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 R7laF%{<~;JIsOsC{{Xw1xCj6M delta 8384 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 diff --git a/src/main/resources/docTemplate/funds3.docx b/src/main/resources/docTemplate/funds3.docx index 48e73da44e09582da9b5d22a3e8d7f6eb13d6b67..8bfbb42d000a4ac7f80935399d881f534ab0d294 100644 GIT binary patch delta 7072 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 VAS8fS5atZh!pn%r%=Mod{{#6KVYdJP delta 7026 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 gJ%oi@1Y8Pn - + @@ -1191,12 +1191,6 @@ module.exports = { keys.forEach(key => { $("#" + key).html("") editors[key] = new E('#' + key) - editors[key].config.excludeMenus = [ - 'video', - 'image', - 'link', - 'code', - ] editors[key].config.onchange = (html) => { this.form[key] = html } @@ -1293,4 +1287,4 @@ module.exports = { .restrictTotalTeam .el-form-item__label { color: red; } - \ No newline at end of file + diff --git a/src/main/resources/static/components/activity/school/DeleteInfo.vue b/src/main/resources/static/components/activity/school/DeleteInfo.vue index 3551573..143d74c 100644 --- a/src/main/resources/static/components/activity/school/DeleteInfo.vue +++ b/src/main/resources/static/components/activity/school/DeleteInfo.vue @@ -116,7 +116,7 @@ module.exports = { {prop: 'identity', label: '身份', sortable: true}, // {prop: 'divisionLevelLeadership', label: '是否处级领导', sortable: true}, {prop: 'status', label: '状态', sortable: true}, - {prop: 'awardsMode', label: '项目类型'}, + // {prop: 'awardsMode', label: '项目类型'}, {prop: 'allName', label: '报名项目'}, ], } diff --git a/src/main/resources/static/components/activity/school/tissueInfo.vue b/src/main/resources/static/components/activity/school/tissueInfo.vue index f60eea8..7624b15 100644 --- a/src/main/resources/static/components/activity/school/tissueInfo.vue +++ b/src/main/resources/static/components/activity/school/tissueInfo.vue @@ -4,7 +4,9 @@ {{ viewData.name }} + + @@ -60,7 +62,18 @@ - {{ viewData.activityContent }} + + + {{ viewData.activityContent }} + + + + + + + {{ viewData.activityExamineContent }} + + @@ -197,32 +210,7 @@ - - - - - - {{ viewData.newsRemark }} - - - - - 暂无 - - - - - 暂无 - - - - - - + {{ viewData.activitySummary }} @@ -320,8 +308,6 @@ module.exports = { data.billFiles = JSON.parse(data.billFiles) data.photoFiles = JSON.parse(data.photoFiles) data.otherFiles = JSON.parse(data.otherFiles) - data.picFiles = JSON.parse(data.picFiles) - data.newsFiles = JSON.parse(data.newsFiles) this.userData = clone(data.tissuePersonList) data.unionUserNumberLimit = JSON.parse(data.unionUserNumberLimit) data.location = JSON.parse(data.location) diff --git a/src/main/resources/static/components/welfare/CourierNumberInfo.vue b/src/main/resources/static/components/welfare/CourierNumberInfo.vue index d480422..3e2c8d5 100644 --- a/src/main/resources/static/components/welfare/CourierNumberInfo.vue +++ b/src/main/resources/static/components/welfare/CourierNumberInfo.vue @@ -53,7 +53,6 @@ module.exports = { }, methods: { async openView(welfareId, userId) { - this.dialogVisible = true this.loading = true const { code, @@ -67,6 +66,12 @@ module.exports = { this.$message.warning('您还没有选择福利套餐') return } + if (Object.keys(data).length === 0){ + this.dialogVisible = false + this.$message.warning('暂无物流信息') + return + } + this.dialogVisible = true this.courierNumberInfoData = data const keys = Object.keys(this.courierNumberInfoData) this.activeName = keys && keys[0] diff --git a/src/main/resources/views/mobile/activity/Sports/activityList.html b/src/main/resources/views/mobile/activity/Sports/activityList.html index b9298e8..eaf7bb9 100644 --- a/src/main/resources/views/mobile/activity/Sports/activityList.html +++ b/src/main/resources/views/mobile/activity/Sports/activityList.html @@ -1,7 +1,21 @@ - +
@@ -15,7 +29,6 @@ layout("/mobile/platform.html"){
-
@@ -31,20 +44,18 @@ layout("/mobile/platform.html"){ {{moment(o.applyStartTime).format('YYYY/MM/DD HH:mm')}} 至 {{moment(o.applyEndTime).format('YYYY/MM/DD HH:mm')}} - {{moment(o.startTime).format('YYYY/MM/DD HH:mm')}} 至 {{moment(o.endTime).format('YYYY/MM/DD HH:mm')}} - - 报名结束 - - 报名中 - + 未开始 + 报名中 + 进行中 + 活动结束
@@ -55,7 +66,6 @@ layout("/mobile/platform.html"){ description="暂无数据"> -
\ No newline at end of file +#--> diff --git a/src/main/resources/views/mobile/activity/unionActivity/unionReg.html b/src/main/resources/views/mobile/activity/unionActivity/unionReg.html index 52a260f..282a3f5 100644 --- a/src/main/resources/views/mobile/activity/unionActivity/unionReg.html +++ b/src/main/resources/views/mobile/activity/unionActivity/unionReg.html @@ -42,13 +42,13 @@ layout("/mobile/platform.html"){
- + - - + + - - + + @@ -123,16 +124,25 @@ layout("/mobile/platform.html"){
- + v-if="tagCloseable"> 提 交 - - 修 改 - + +
@@ -169,6 +179,32 @@ layout("/mobile/platform.html"){ } }, methods: { + async doCancel() { + const confirm = await this.$dialog.confirm({ + title: '提示', + message: '您确认要取消报名吗？', + }) + const loading = this.$toast.loading({ + message: '取消中...', + forbidClick: true, + overlay: true, + duration: 0 + }) + if (confirm === 'confirm') { + const resp = await $.post('/mobile/activity/unionActivity/doSingleCancelRegister', {activityId: this.activityId}) + if (resp.code === 0) { + setTimeout(() => { + loading.close() + this.$toast.success(resp.msg) + setTimeout(() => { + window.history.back() + }, 400) + }, 1000) + } else { + this.$toast.fail(resp.msg) + } + } + }, async getRegisterUser() { const resp = await $.get('/mobile/activity/myActivity/selectRegisterList', {activityId: this.activityId}) if (resp.code === 0) { @@ -209,6 +245,7 @@ layout("/mobile/platform.html"){ searchUserAdd(item) { const {id, userName} = item this.registerList.push({id, userName}) + this.$toast.success("添加成功") }, async removeRegUser(item) { if (this.userId === item.id) { @@ -304,11 +341,14 @@ layout("/mobile/platform.html"){ personIds: JSON.stringify(this.registerList.map(v => v.id)) } const resp = await $.post('/mobile/activity/unionActivity/doSaveUnionRegister', params) - loading.close() + if (resp.code === 0) { await this.getRegisterUser() await this.getHasRegUserNum() - this.$toast.success(resp.msg) + setTimeout(() => { + loading.close() + this.$toast.success(resp.msg) + }, 1000) } else { this.$toast.fail(resp.msg) } @@ -337,4 +377,4 @@ layout("/mobile/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/activity/basic/ActivityBasic.html b/src/main/resources/views/platform/activity/basic/ActivityBasic.html index 8c01e02..2bf1171 100644 --- a/src/main/resources/views/platform/activity/basic/ActivityBasic.html +++ b/src/main/resources/views/platform/activity/basic/ActivityBasic.html @@ -135,15 +135,14 @@ layout("/layouts/platform.html"){ - + :page-sizes="[10, 20, 30, 50]" + :total="pageForm.totalCount" + @current-change="pageNumberChange" + @size-change="pageSizeChange" + layout="total, sizes, prev, pager, next, jumper">
@@ -166,7 +165,7 @@ layout("/layouts/platform.html"){ + :disabled="checkData.code==50000||checkData.code==40000||checkData.code=='jcsjgl'"> \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/activity/basic/ActivityEvent.html b/src/main/resources/views/platform/activity/basic/ActivityEvent.html index 8d7bbd4..75ccc4f 100644 --- a/src/main/resources/views/platform/activity/basic/ActivityEvent.html +++ b/src/main/resources/views/platform/activity/basic/ActivityEvent.html @@ -49,6 +49,11 @@ layout("/layouts/platform.html"){ +
+ +
+
搜索 @@ -407,23 +412,25 @@ layout("/layouts/platform.html"){ return } + let msg = "确定要勾选的项目赋年龄限制吗?" if (this.pageForm.ageDate == null) { - this.$notify({ - title: '警告', - message: '请选择需要赋值的时间段', - type: 'warning' - }); - return + msg = "您没有在左侧填写年龄限制，现将您勾选的项目年龄清空，请确认" + /* this.$notify({ + title: '警告', + message: '请选择需要赋值的时间段', + type: 'warning' + }); + return*/ } - const confirm = await this.$confirm('确定要勾选的项目赋年龄限制吗？', '提示', { + const confirm = await this.$confirm(msg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }) if (confirm === "confirm") { const data = await $.post(loc() + "/doAssignmentDate", { - startAgeDate: this.pageForm.ageDate[0], - endAgeDate: this.pageForm.ageDate[1], + startAgeDate: this.pageForm.ageDate ? this.pageForm.ageDate[0] : '', + endAgeDate: this.pageForm.ageDate ? this.pageForm.ageDate[1] : '', eventIds: JSON.stringify(this.multipleSelection.map(v => v.id)) }) this.$notify.success({title: '成功', message: data.msg}); @@ -452,19 +459,19 @@ layout("/layouts/platform.html"){ //查询比赛组别 async focusGroup() { const resp = await $.post(loc() + "/focusGroup") - if(resp.code===0){ + if (resp.code === 0) { this.groupList = resp.data - }else{ - this.notifyWarning(resp.msg) + } else { + this.notifyWarning(resp.msg) } }, //查询运动类型 async exerciseType() { const resp = await $.post(loc() + "/exerciseType") - if(resp.code===0){ + if (resp.code === 0) { this.exerciseTypeList = resp.data - }else{ + } else { this.notifyWarning(resp.msg) } }, @@ -472,9 +479,9 @@ layout("/layouts/platform.html"){ //查询距离 async focusDistance() { const resp = await $.post(loc() + "/focusDistance") - if(resp.code===0){ + if (resp.code === 0) { this.distanceList = resp.data; - }else{ + } else { this.notifyWarning(resp.msg) } }, @@ -482,9 +489,9 @@ layout("/layouts/platform.html"){ //根据运动id查询下面有哪些具体的运动项目 async changeExercise_typeList() { const resp = await $.post(loc() + "/changeExercise_typeList", {exerciseType: this.formData.exerciseType}) - if(resp.code===0){ + if (resp.code === 0) { this.exerciseTypeList2 = resp.data - }else{ + } else { this.notifyWarning(resp.msg) } }, @@ -546,10 +553,10 @@ layout("/layouts/platform.html"){ this.loading = true const resp = await $.post(loc() + "/doAdd", this.formData) this.loading = false - if(resp.code===0){ + if (resp.code === 0) { this.pageData(); this.$refs.guava.index() - }else{ + } else { this.notifyWarning(resp.msg) } } @@ -577,10 +584,10 @@ layout("/layouts/platform.html"){ async switchChange(data) { this.formData = data const resp = await $.post(loc() + "/doEdit", this.formData) - if(resp.code===0){ + if (resp.code === 0) { this.notifySuccess(resp.msg) this.pageData() - }else{ + } else { this.notifyWarning(resp.msg) } }, @@ -644,10 +651,10 @@ layout("/layouts/platform.html"){ this.loading = true const resp = await $.post(loc() + "/doEdit", this.formData) this.loading = true - if(resp.code===0){ + if (resp.code === 0) { this.pageData(); this.$refs.guava.index() - }else{ + } else { this.notifyWarning(resp.msg) } } @@ -690,9 +697,9 @@ layout("/layouts/platform.html"){ this.$set(row, "loading", true) const resp = await $.post(loc() + "/doDelete", {id: id}); this.$set(row, "loading", false) - if(resp.code===0){ + if (resp.code === 0) { this.pageData() - }else{ + } else { this.notifyWarning(resp.msg) } } diff --git a/src/main/resources/views/platform/activity/basic/ActivityUnion.html b/src/main/resources/views/platform/activity/basic/ActivityUnion.html index 6dd6246..0c373cd 100644 --- a/src/main/resources/views/platform/activity/basic/ActivityUnion.html +++ b/src/main/resources/views/platform/activity/basic/ActivityUnion.html @@ -102,7 +102,7 @@ layout("/layouts/platform.html"){ - 院级工会信息 + 分工会信息
@@ -405,7 +405,7 @@ layout("/layouts/platform.html"){ label="单位" show-overflow-tooltip> @@ -511,8 +511,8 @@ layout("/layouts/platform.html"){ v-model="formData.unioncode" auto-complete="off" tabindex="4" type="text"> - - + + @@ -551,7 +551,7 @@ layout("/layouts/platform.html"){ @@ -566,8 +566,8 @@ layout("/layouts/platform.html"){ v-model="formData.unioncode" auto-complete="off" tabindex="4" type="text"> - - + + @@ -1477,4 +1477,4 @@ layout("/layouts/platform.html"){
\ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/activity/basic/ActivityUnit.html b/src/main/resources/views/platform/activity/basic/ActivityUnit.html index 5944a17..e7c0076 100644 --- a/src/main/resources/views/platform/activity/basic/ActivityUnit.html +++ b/src/main/resources/views/platform/activity/basic/ActivityUnit.html @@ -114,7 +114,7 @@ layout("/layouts/platform.html"){