From e3be4cbd6e327b55563f97290f16716929ccd451 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sat, 25 Apr 2026 08:53:03 +0800 Subject: [PATCH 1/9] commit --- .../ActivitySportsApplyUserServiceImpl.java | 1 + .../AIdFundPayRecordController.java | 31 ++++++ .../AidFundChangeRecordController.java | 28 ++++++ .../AidFundUnionAuditController.java | 53 +++++++++- .../service/AidFundMemberPayService.java | 8 ++ .../impl/AidFundMemberPayServiceImpl.java | 98 +++++++++++++++++++ .../aidFund/changeRecord/index.html | 18 ++++ .../aidFund/payRecord/index.html | 9 ++ .../aidFund/unionAudit/index.html | 28 +++++- 9 files changed, 272 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java index 2fa76b3e..748018ff 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java @@ -153,6 +153,7 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl 0 applyed, (SELECT COUNT(1) FROM activity_school_apply app WHERE app.activityId=school.id AND app.unionId=@unionId AND app.unionLeader=TRUE) LeaderCount, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AIdFundPayRecordController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AIdFundPayRecordController.java index 7320083c..e48fc5de 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AIdFundPayRecordController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AIdFundPayRecordController.java @@ -126,6 +126,37 @@ public class AIdFundPayRecordController { CommonDownloadUtil.download(pageForm.getYear() + "会员年度缴费记录.xlsx", workbook, response); } + @At + @Ok("void") + @ApiOperation("导出年度缴费名单") + @SaCheckPermission("medicalMutualAid.aidFund.payRecord") + public void exportAnnualPayMemberList(AidFundPageForm pageForm, HttpServletResponse response) { + /* + * 导出参数说明： + * pageForm 可传所属工会、所属单位、会员类型、姓名/工号关键字等筛选条件； + * 返回 Excel 列为工号、姓名、单位，以及 2015 到当前年度的动态缴费金额列。 + */ + List years = IntStream.rangeClosed(2015, DateUtil.thisYear()) + .boxed() + .toList(); + + List entityList = new ArrayList<>(); + entityList.add(new ExcelExportEntity("工号", "loginname", 20)); + entityList.add(new ExcelExportEntity("姓名", "username", 20)); + entityList.add(new ExcelExportEntity("单位", "unitName", 30)); + years.forEach(year -> { + ExcelExportEntity entity = new ExcelExportEntity(String.valueOf(year), String.valueOf(year), 20); + entity.setType(10); + entityList.add(entity); + }); + + List list = aidFundMemberPayService.getAnnualPayMemberList(pageForm); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, list); + CommonDownloadUtil.download("年度缴费名单.xlsx", workbook, response); + } + @At @Ok("void") @ApiOperation("导出缴费名单") diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundChangeRecordController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundChangeRecordController.java index b0f9a489..fbdf093e 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundChangeRecordController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundChangeRecordController.java @@ -3,23 +3,28 @@ package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.param.AidFundPageForm; import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService; import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; 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.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; /** * @author zhf @@ -37,6 +42,9 @@ public class AidFundChangeRecordController { @Inject private AidFundMemberChangeRecordService changeRecordService; + @Inject + private FlowEngine flowEngine; + @At("") @Ok("beetl:/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/changeRecord/index.html") @SaCheckPermission("medicalMutualAid.aidFund.changeRecord") @@ -105,5 +113,25 @@ public class AidFundChangeRecordController { return Result.success(pagination); } + /** + * 删除基金会员变更记录。 + * + * @param id 变更记录 ID，前端列表行中的 row.id + * @return Result，删除成功时返回 success；ID 为空时返回失败提示 + */ + @At + @ApiOperation("删除") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("medicalMutualAid.aidFund.changeRecord") + @SLog(tag = "基金会员-变更记录", msg = "删除变更记录") + public Result delete(@Param("id") String id) { + if (StrUtil.isBlank(id)) { + return Result.error("请选择需要删除的变更记录"); + } + changeRecordService.delete(id); + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); + return Result.success(); + } + } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundUnionAuditController.java index b93013db..91f31031 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundUnionAuditController.java @@ -3,11 +3,13 @@ package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence; import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService; @@ -26,6 +28,7 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import java.util.List; +import java.util.Objects; /** * @author zhf @@ -115,7 +118,9 @@ public class AidFundUnionAuditController { cnd.andEX("info.changeType", "=", changeType); cnd.and("t.taskName", "=", "06ed1d6d-5f96-485f-9150-ed1ef4a082d6"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())){ + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + } if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); @@ -133,4 +138,50 @@ public class AidFundUnionAuditController { Pagination pageVO = changeRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pageVO); } + + /** + * 查询所有未审核分工会对应的分工会主席工号。 + * + * @param year 年度，按变更记录申请时间的年份筛选 + * @param aidFundMemberUserType 基金会员类型，传字典编码；为空时不限制 + * @param changeType 变更类型，传字典编码；为空时不限制 + * @return Result，data 为需要发送通知的分工会主席工号列表 + */ + @At + @ApiOperation("查询未审核分工会主席工号") + @SaCheckPermission("medicalMutualAid.aidFund.unionAudit") + public Result notifyUnapprovedUnionChairman(@Param(value = "year") Integer year, + @Param(value = "aidFundMemberUserType") String aidFundMemberUserType, + @Param(value = "changeType") String changeType) { + Sql sql = Sqls.create(""" + SELECT DISTINCT + chairman.loginname + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN aid_fund_member_change_record info ON info.id = ins.businessNo + LEFT JOIN vw_user us ON us.id = info.userId + LEFT JOIN sys_user_role ur ON ur.unionId = us.unionId + LEFT JOIN sys_role role ON role.id = ur.roleId + LEFT JOIN sys_user chairman ON chairman.id = ur.userId + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(info.applyTime)", "=", year); + cnd.andEX("IFNULL(info.aidFundMemberUserType, us.aidFundMemberUserType)", "=", aidFundMemberUserType); + cnd.andEX("info.changeType", "=", changeType); + cnd.and("t.taskName", "=", "06ed1d6d-5f96-485f-9150-ed1ef4a082d6"); + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + cnd.and("role.code", "=", RoleConstant.BRANCH_UNION_CHAIRMAN.name()); + cnd.and("chairman.loginname", "is not", null); + sql.setCondition(cnd); + + // 这里只返回需要发送通知的主席工号，真实消息发送功能由后续消息接口接入。 + List loginNames = changeRecordService.listMap(sql).stream() + .map(map -> map.getString("loginname")) + .filter(Objects::nonNull) + .distinct() + .toList(); + return Result.success(loginNames); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/AidFundMemberPayService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/AidFundMemberPayService.java index e7251ca7..fedc5220 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/AidFundMemberPayService.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/AidFundMemberPayService.java @@ -15,4 +15,12 @@ public interface AidFundMemberPayService extends BaseService { Sql getSql(AidFundPageForm pageForm); List getYearPayList(AidFundPageForm pageForm); + + /** + * 查询年度缴费名单导出数据。 + * + * @param pageForm 页面筛选参数，包含所属工会、所属单位、会员类型、姓名/工号关键字等条件 + * @return 返回导出行数据，字段包含 loginname、username、unitName，以及 2015 到当前年度的缴费金额字段 + */ + List getAnnualPayMemberList(AidFundPageForm pageForm); } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/impl/AidFundMemberPayServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/impl/AidFundMemberPayServiceImpl.java index 469e4150..5f054706 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/impl/AidFundMemberPayServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/impl/AidFundMemberPayServiceImpl.java @@ -201,4 +201,102 @@ public class AidFundMemberPayServiceImpl extends BaseServiceImpl getAnnualPayMemberList(AidFundPageForm pageForm) { + /* + * 导出参数说明： + * pageForm.unionId：按所属工会筛选； + * pageForm.unitId：按所属单位筛选； + * pageForm.aidFundMemberUserType：按基金会员类型筛选； + * pageForm.searchKeyword：按姓名或工号模糊筛选。 + * 返回值字段：loginname、username、unitName 为人员基础信息，2015 到当前年度字段为对应年度缴费金额。 + */ + List years = IntStream.rangeClosed(2015, DateUtil.thisYear()) + .boxed() + .toList(); + + Cnd userCnd = Cnd.where(View_user::getAidFundMember, "=", 1); + userCnd.andEX(View_user::getUnionId, "=", pageForm.getUnionId()); + userCnd.andEX(View_user::getUnitId, "=", pageForm.getUnitId()); + userCnd.andEX(View_user::getAidFundMemberUserType, "=", pageForm.getAidFundMemberUserType()); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike(View_user::getLoginname, pageForm.getSearchKeyword(), true); + group.orLike(View_user::getUsername, pageForm.getSearchKeyword(), true); + userCnd.and(group); + } + userCnd.desc(View_user::getUnitCode); + List userList = dao().query(View_user.class, userCnd); + + Set oldLoginNames = new HashSet<>(); + Map oldLoginToUserId = new HashMap<>(); + for (View_user user : userList) { + if (StrUtil.isNotBlank(user.getOldLoginName())) { + oldLoginNames.add(user.getOldLoginName()); + } + } + + if (!oldLoginNames.isEmpty()) { + List oldUsers = dao().query(Sys_user.class, + Cnd.where(Sys_user::getLoginname, "in", new ArrayList<>(oldLoginNames))); + for (Sys_user oldUser : oldUsers) { + oldLoginToUserId.put(oldUser.getLoginname(), oldUser.getId()); + } + } + + Set allUserIds = new HashSet<>(); + for (View_user user : userList) { + allUserIds.add(user.getId()); + if (StrUtil.isNotBlank(user.getOldLoginName())) { + String oldUserId = oldLoginToUserId.get(user.getOldLoginName()); + if (oldUserId != null) { + allUserIds.add(oldUserId); + } + } + } + + List payList = allUserIds.isEmpty() + ? new ArrayList<>() + : query(Cnd.where(AidFundMemberPay::getUserId, "in", new ArrayList<>(allUserIds))); + + Map> payIndex = new HashMap<>(); + for (AidFundMemberPay pay : payList) { + if (pay.getUserId() == null || pay.getYear() == null || pay.getMoney() == null) { + continue; + } + payIndex.computeIfAbsent(pay.getUserId(), k -> new HashMap<>()) + .put(pay.getYear(), pay.getMoney()); + } + + List result = new ArrayList<>(); + for (View_user user : userList) { + NutMap row = NutMap.NEW(); + row.put("loginname", user.getLoginname()); + row.put("username", user.getUsername()); + row.put("unitName", user.getUnitName()); + + Set userIds = new HashSet<>(); + userIds.add(user.getId()); + if (StrUtil.isNotBlank(user.getOldLoginName())) { + String oldUserId = oldLoginToUserId.get(user.getOldLoginName()); + if (oldUserId != null) { + userIds.add(oldUserId); + } + } + + for (Integer year : years) { + Double yearMoney = 0.0; + for (String userId : userIds) { + Double money = Optional.ofNullable(payIndex.get(userId)) + .map(map -> map.get(year)) + .orElse(0.0); + yearMoney += money; + } + row.put(String.valueOf(year), yearMoney == 0.0 ? null : yearMoney); + } + result.add(row); + } + return result; + } } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/changeRecord/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/changeRecord/index.html index a442f2a7..2749892a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/changeRecord/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/changeRecord/index.html @@ -84,6 +84,7 @@ layout("/layouts/platform.html"){ @@ -135,6 +136,23 @@ layout("/layouts/platform.html"){ this.$refs.infoRef.onOpen(row) }) }, + onDelete(row) { + this.$confirm("确定要删除【" + row.username + "】的变更记录吗？删除后将同步删除关联流程记录", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.formLoading = true + this.$axios.post(loc() + "/delete", {id: row.id}).then((res) => { + if (res.code === 0) { + this.$message.success(res.msg) + this.doSearch() + } + }).finally(() => { + this.formLoading = false + }) + }) + }, async unionChange(val) { this.pageForm.unitId = null this.unitList = await this.$businessTool.listUnit(val) diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html index da383d68..ee4d5d85 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/payRecord/index.html @@ -75,6 +75,12 @@ layout("/layouts/platform.html"){ type="primary">导出会员缴费金额 + 导出年度缴费名单 + + 已审核 未审核 + + 一键通知未审核工会 + + ref="table" row-key="id" style="width: 100%" v-loading="tableLoading"> { + this.formLoading = true + this.$axios.post(loc() + "/notifyUnapprovedUnionChairman", { + year: this.pageForm.year, + aidFundMemberUserType: this.pageForm.aidFundMemberUserType, + changeType: this.pageForm.changeType + }).then((res) => { + if (res.code === 0) { + const loginNames = res.data || [] + this.$alert(loginNames.length ? loginNames.join("、") : "暂无需要发送通知的人员", "需要发送人的工号", { + confirmButtonText: "确定" + }) + } + }).finally(() => { + this.formLoading = false + }) + }) + }, handleTaskAction(val) { this.$confirm("您确定要提交吗？", "提示", { From 9b92c2919757d3164d7ecf0594a0c36309228809 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Sat, 25 Apr 2026 11:41:14 +0800 Subject: [PATCH 2/9] =?UTF-8?q?bug=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutlayManageUnionAllocateService.java | 41 +++++ .../OutlayManageUnionAllocateServiceImpl.java | 150 ++++++++++++++++++ .../OutlayManageUnionAllocateController.java | 62 ++++++++ .../DifficultHelpApplyController.java | 19 ++- .../service/DifficultHelpCommonService.java | 18 +++ .../impl/DifficultHelpCommonServiceImpl.java | 32 ++++ .../outlay/activityBudget/apply/index.html | 8 +- .../outlayManage/union/allocate/index.html | 150 ++++++++++++++++-- .../difficulthelp/apply/index.html | 13 +- .../schoolunionapproval/index.html | 2 +- .../unionLeaderApproval/index.html | 19 ++- 11 files changed, 486 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java index e9daa959..8b8ac9f1 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java @@ -3,8 +3,12 @@ package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutLayAllocateUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.vo.OutlayUnionAllocateImportVo; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.mvc.upload.TempFile; import java.math.BigDecimal; +import java.util.List; /** * 分工会季度额度分配服务。 @@ -35,6 +39,43 @@ public interface OutlayManageUnionAllocateService extends BaseService只要当前季度记录中存在分配额度大于 0 的有效记录， + * 就认为该季度已经分配过额度，前端据此决定是否提示再次分配。

+ * + * @param quarterly 要检查的季度，例如 1/2/3/4 + * @param year 要检查的年份 + * @return true 已分配过；false 未分配 + */ + boolean hasAllocated(Integer quarterly, Integer year); + + /** + * 解析导入文件并返回预览数据。 + * + * @param file Excel 文件 + * @return 解析后的预览数据 + */ + List readImportExcel(TempFile file); + + /** + * 根据导入数据按分工会逐条分配季度额度。 + * + * @param importList 导入预览数据 + * @param quarterly 当前季度 + * @param year 当前年度 + * @return 导入分配结果 + */ + Result doImportAllocate(List importList, Integer quarterly, Integer year); + + /** + * 导出分工会额度导入模板。 + * + * @return 模板工作簿 + */ + Workbook exportImportTemplate(); + /** * 重置当前季度的分配记录。 * diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java index e4dcee80..91af4325 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java @@ -1,20 +1,36 @@ package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.impl; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.hutool.core.io.FileUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.sys.models.Sys_union; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayManageUnionAllocateService; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutLayAllocateUnion; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.vo.OutlayUnionAllocateImportVo; +import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Lang; +import org.nutz.mvc.upload.TempFile; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; +import java.util.Set; /** * 分工会季度额度分配实现。 @@ -57,6 +73,140 @@ public class OutlayManageUnionAllocateServiceImpl extends BaseServiceImpl", BigDecimal.ZERO)); + return count > 0; + } + + @Override + public List readImportExcel(TempFile file) { + String extName = FileUtil.extName(file.getFile()); + if (!"xlsx".equalsIgnoreCase(extName) && !"xls".equalsIgnoreCase(extName)) { + throw Lang.makeThrow("请上传xlsx或xls格式文件"); + } + List importList = ExcelImportUtil.importExcel(file.getFile(), + OutlayUnionAllocateImportVo.class, new ImportParams()); + List unionList = dao().query(Sys_union.class, Cnd.NEW()); + Map unionMap = new HashMap<>(); + for (Sys_union union : unionList) { + unionMap.put(union.getUnionCode(), union); + } + Set duplicateUnionCodeSet = new LinkedHashSet<>(); + Set existUnionCodeSet = new LinkedHashSet<>(); + for (OutlayUnionAllocateImportVo item : importList) { + if (StrUtil.isBlank(item.getUnionCode())) { + continue; + } + if (!existUnionCodeSet.add(item.getUnionCode())) { + duplicateUnionCodeSet.add(item.getUnionCode()); + } + } + for (int i = 0; i < importList.size(); i++) { + OutlayUnionAllocateImportVo item = importList.get(i); + item.setRowNum(i + 2); + if (StrUtil.isBlank(item.getUnionCode())) { + item.setErrMsg("工会编码不能为空"); + continue; + } + if (item.getAllocateMoney() == null) { + item.setErrMsg("分配额度不能为空"); + continue; + } + if (item.getAllocateMoney().compareTo(BigDecimal.ZERO) < 0) { + item.setErrMsg("分配额度不能小于0"); + continue; + } + Sys_union union = unionMap.get(item.getUnionCode()); + if (Lang.isEmpty(union)) { + item.setErrMsg("工会编码不存在"); + continue; + } + item.setUnionName(union.getName()); + if (duplicateUnionCodeSet.contains(item.getUnionCode())) { + item.setErrMsg("工会编码重复"); + } + } + return importList; + } + + @Override + public Result doImportAllocate(List importList, Integer quarterly, Integer year) { + if (importList == null || importList.isEmpty()) { + return Result.error("请先上传导入数据"); + } + List allocateUnionList = dao().query(OutLayAllocateUnion.class, + Cnd.where(OutLayAllocateUnion::getQuarterly, "=", quarterly) + .and(OutLayAllocateUnion::getYear, "=", year) + .and(OutLayAllocateUnion::getDelFlag, "=", false)); + if (allocateUnionList == null || allocateUnionList.isEmpty()) { + return Result.error("当前季度没有分配记录！"); + } + List unionList = dao().query(Sys_union.class, Cnd.NEW()); + Map unionMap = new HashMap<>(); + for (Sys_union union : unionList) { + unionMap.put(union.getUnionCode(), union); + } + Map allocateUnionMap = new HashMap<>(); + for (OutLayAllocateUnion allocateUnion : allocateUnionList) { + allocateUnionMap.put(allocateUnion.getUnionId(), allocateUnion); + } + List errorList = new ArrayList<>(); + for (OutlayUnionAllocateImportVo item : importList) { + if (StrUtil.isBlank(item.getUnionCode())) { + errorList.add("第" + item.getRowNum() + "行：工会编码不能为空"); + continue; + } + if (item.getAllocateMoney() == null) { + errorList.add("第" + item.getRowNum() + "行：分配额度不能为空"); + continue; + } + if (item.getAllocateMoney().compareTo(BigDecimal.ZERO) < 0) { + errorList.add("第" + item.getRowNum() + "行：分配额度不能小于0"); + continue; + } + if (StrUtil.isNotBlank(item.getErrMsg())) { + errorList.add("第" + item.getRowNum() + "行：" + item.getErrMsg()); + continue; + } + Sys_union union = unionMap.get(item.getUnionCode()); + if (Lang.isEmpty(union)) { + errorList.add("第" + item.getRowNum() + "行：工会编码不存在"); + continue; + } + if (!allocateUnionMap.containsKey(union.getId())) { + errorList.add("第" + item.getRowNum() + "行：当前季度未生成该分工会分配记录"); + } + } + if (!errorList.isEmpty()) { + return Result.error(String.join("；", errorList)); + } + for (OutlayUnionAllocateImportVo item : importList) { + Sys_union union = unionMap.get(item.getUnionCode()); + OutLayAllocateUnion allocateUnion = allocateUnionMap.get(union.getId()); + // 导入分配与手工分配保持同一套金额同步规则，确保季度表和年度预算表数据一致。 + applyAllocateMoney(allocateUnion, item.getAllocateMoney()); + } + return Result.success("导入分配成功"); + } + + @Override + public Workbook exportImportTemplate() { + List entityList = new ArrayList<>(); + entityList.add(new ExcelExportEntity("工会编码", "unionCode", 20)); + entityList.add(new ExcelExportEntity("分配额度", "allocateMoney", 20)); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + return ExcelExportUtil.exportExcel(exportParams, entityList, new ArrayList<>()); + } + @Override public Result deleteAllocateRecord() { int currentQuarter = getCurrentQuarter(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java index 9112d0fe..27bd53fe 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.controller; +import com.budwk.app.base.utils.CommonDownloadUtil; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -12,9 +13,11 @@ import com.budwk.app.sys.models.Sys_union; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayManageUnionAllocateService; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutLayAllocateUnion; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.vo.OutlayUnionAllocateImportVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; @@ -22,11 +25,17 @@ 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.json.Json; import org.nutz.lang.Lang; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import org.nutz.mvc.annotation.POST; +import org.nutz.mvc.upload.TempFile; +import org.nutz.mvc.upload.UploadAdaptor; +import org.nutz.mvc.annotation.AdaptBy; +import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -107,6 +116,59 @@ public class OutlayManageUnionAllocateController { return outlayManageUnionAllocateService.doBatchAllocate(allocateMoney, quarterly, year); } + @At + @ApiOperation("校验当前季度是否已分配额度") + @SaCheckPermission("outlay.outlayManage.union.allocate") + public Result hasAllocated(@Param("quarterly") Integer quarterly, + @Param("year") Integer year) { + if (quarterly == null || year == null) { + return Result.error("参数错误！"); + } + return Result.success(outlayManageUnionAllocateService.hasAllocated(quarterly, year)); + } + + @At + @POST + @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) + @ApiOperation("读取导入分配Excel") + @SaCheckPermission("outlay.outlayManage.union.allocate") + public Result readImportExcel(TempFile file) { + try { + return Result.success(outlayManageUnionAllocateService.readImportExcel(file)); + } catch (Exception e) { + log.error("读取分工会额度导入文件失败", e); + return Result.error(e.getMessage()); + } + } + + @At + @ApiOperation("导入分配分工会额度") + @Aop(TransAop.READ_COMMITTED) + @SLog(tag = "分工会预算-季度预算分配", msg = "导入分配分工会额度") + @SaCheckPermission("outlay.outlayManage.union.allocate") + public Result doImportAllocate(String data, + @Param("quarterly") Integer quarterly, + @Param("year") Integer year) { + if (StrUtil.isBlank(data) || quarterly == null || year == null) { + return Result.error("参数错误！"); + } + List importList = Json.fromJsonAsList(OutlayUnionAllocateImportVo.class, data); + return outlayManageUnionAllocateService.doImportAllocate(importList, quarterly, year); + } + + @At + @Ok("void") + @ApiOperation("下载导入分配模板") + @SaCheckPermission("outlay.outlayManage.union.allocate") + public void downloadImportTemplate(HttpServletResponse response) { + try { + Workbook workbook = outlayManageUnionAllocateService.exportImportTemplate(); + CommonDownloadUtil.download("分工会额度导入模板.xlsx", workbook, response); + } catch (Exception e) { + log.error("下载分工会额度导入模板失败", e); + } + } + @At @ApiOperation("重置预算季度记录") diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java index 9172c36e..c003d660 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java @@ -84,6 +84,9 @@ public class DifficultHelpApplyController { public Result getIsCanPlay() { //获取申请次数，不想再写一个接口, are you ok? .and("zt", "=", 600) int applyCount = dao.count(DifficultHelpInfo.class, Cnd.where("proxyUserId", "=", SecurityUtil.getUserId())); + // 页面初始化时需要先判断当前登录人本年度是否已经申请过，避免重复进入新增申请。 + boolean hasCurrentYearApply = dao.count(DifficultHelpInfo.class, Cnd.where("userId", "=", SecurityUtil.getUserId()) + .and("YEAR(applyTime)", "=", DateUtil.getYear())) > 0; Sys_config startConfig = dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "DifficultyApplyStartTime")); Sys_config endConfig = dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "DifficultyApplyEndTime")); if(startConfig != null && endConfig != null) { @@ -98,9 +101,9 @@ public class DifficultHelpApplyController { int endResult = cn.hutool.core.date.DateUtil.compare(cn.hutool.core.date.DateUtil.parse(today), cn.hutool.core.date.DateUtil.parse(end)); String time = startConfig.getConfigValue().replace("-", "月") + "日-" + endConfig.getConfigValue().replace("-", "月") + "日"; - return Result.success(Map.of("applyCount", applyCount,"time", time, "result", startResult >=0 && endResult <= 0)); + return Result.success(Map.of("applyCount", applyCount,"time", time, "result", startResult >=0 && endResult <= 0, "hasCurrentYearApply", hasCurrentYearApply)); } else { - return Result.success(Map.of("applyCount", applyCount,"time", "", "result", false)); + return Result.success(Map.of("applyCount", applyCount,"time", "", "result", false, "hasCurrentYearApply", hasCurrentYearApply)); } } @@ -110,6 +113,10 @@ public class DifficultHelpApplyController { @SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}") public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) { difficultHelpInfo.setApplyTime(ObjectUtil.defaultIfNull(difficultHelpInfo.getApplyTime(), new Date())); + difficultHelpCommonService.refreshApplyCount(difficultHelpInfo); + if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) { + return Result.error("该人员本年度已申请困难帮扶，不能重复申请"); + } dao.insertOrUpdate(difficultHelpInfo); return Result.success(); } @@ -122,6 +129,10 @@ public class DifficultHelpApplyController { @SLog(tag = "困难补助申请", msg = "提交申请,填写人: ${args[0].proxyUserName}") public Result submit(@Param("data") DifficultHelpInfo difficultHelpInfo){ difficultHelpInfo.setApplyTime(new Date()); + difficultHelpCommonService.refreshApplyCount(difficultHelpInfo); + if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) { + return Result.error("该人员本年度已申请困难帮扶，不能重复申请"); + } dao.insertOrUpdate(difficultHelpInfo); // 开启流程实例 @@ -146,6 +157,10 @@ public class DifficultHelpApplyController { @SLog(tag = "困难补助申请", msg = "重新提交申请,填写人: ${args[0].proxyUserName}") public Result submitAgain(@Param("data") DifficultHelpInfo difficultHelpInfo, @Param("taskId") Long taskId) { difficultHelpInfo.setApplyTime(ObjectUtil.defaultIfNull(difficultHelpInfo.getApplyTime(), new Date())); + difficultHelpCommonService.refreshApplyCount(difficultHelpInfo); + if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) { + return Result.error("该人员本年度已申请困难帮扶，不能重复申请"); + } dao.insertOrUpdate(difficultHelpInfo); Dict dict = Dict.create(); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java index 81fa16be..dfa46c34 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java @@ -7,6 +7,7 @@ import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.param.AidFundPag import org.nutz.lang.util.NutMap; import org.nutz.mvc.upload.TempFile; +import java.util.Date; import java.util.List; /** @@ -26,4 +27,21 @@ public interface DifficultHelpCommonService extends BaseService getYearPayList(DifficultHelpPageParam pageForm); + + /** + * 校验同一受补助人同一年是否已存在申请记录。 + * + * @param userId 受补助人id + * @param applyTime 申请时间 + * @param excludeRecordId 排除的当前记录id，编辑/重新提交时使用 + * @return true 已存在同年申请记录 + */ + boolean hasAppliedInYear(String userId, Date applyTime, String excludeRecordId); + + /** + * 新申请时按历史总申请次数重新计算申请次数字段，已有记录则保留原值。 + * + * @param difficultHelpInfo 申请信息 + */ + void refreshApplyCount(DifficultHelpInfo difficultHelpInfo); } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java index 49e126c2..0ef9198b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java @@ -50,6 +50,38 @@ public class DifficultHelpCommonServiceImpl extends BaseServiceImpl", excludeRecordId); + } + // 按受补助人和申请年份校验，确保同一个人每年只能保留一条申请记录。 + return dao().count(DifficultHelpInfo.class, cnd) > 0; + } + + @Override + public void refreshApplyCount(DifficultHelpInfo difficultHelpInfo) { + if (difficultHelpInfo == null || StrUtil.isBlank(difficultHelpInfo.getUserId())) { + return; + } + if (StrUtil.isNotBlank(difficultHelpInfo.getId())) { + DifficultHelpInfo dbInfo = dao().fetch(DifficultHelpInfo.class, difficultHelpInfo.getId()); + if (dbInfo != null) { + // 已存在的申请记录沿用原申请次数，避免编辑或重新提交时重复累加。 + difficultHelpInfo.setApplyCount(dbInfo.getApplyCount()); + return; + } + } + int historyApplyCount = dao().count(DifficultHelpInfo.class, Cnd.where("userId", "=", difficultHelpInfo.getUserId())); + // 新申请记录按历史总申请次数 + 1 重新计算申请次数，不使用前端传入值。 + difficultHelpInfo.setApplyCount(historyApplyCount + 1); + } + @Override public List getYearPayList(DifficultHelpPageParam pageForm) { // 1. 生成年份列表 diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html index 2806c48f..8de3835d 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html @@ -249,24 +249,24 @@ layout("/layouts/platform.html"){ async getActivityBudgetType() { const data = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE") let budgetTypeOption = [] - if (this.$auth.hasRoleOr(['SYSADMIN'])) { + if (this.$auth.hasPermission(['activity.budget.apply.system'])) { this.budgetTypeOption = data } else { - if (this.$auth.hasRoleOr(['SCHOOL_UNION_ADMIN'])) { + if (this.$auth.hasPermission(['activity.budget.apply.schoolAdmin'])) { data.map(v => { if (["ACTIVITY_BUDGET_TYPE_ONE"].includes(v.code)) { budgetTypeOption.push(v) } }) } - if (this.$auth.hasRoleOr(['BRANCH_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])) { + if (this.$auth.hasPermission(['activity.budget.apply.branchAdmin'])) { data.map(v => { if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) { budgetTypeOption.push(v) } }) } - if (this.$auth.hasRoleOr(['CLUB_PRESIDENT'])) { + if (this.$auth.hasPermission(['activity.budget.apply.clubPresident'])) { data.map(v => { if (["ACTIVITY_BUDGET_TYPE_THREE"].includes(v.code)) { budgetTypeOption.push(v) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html index 370df3b5..a7cd5e53 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html @@ -98,13 +98,54 @@ layout("/layouts/platform.html"){ - + - + + + 统一分配 + 导入分配 + + + + 取 消 @@ -137,8 +178,11 @@ layout("/layouts/platform.html"){ quarterlyList: [], batchAllocateDialogVisible: false, batchAllocateForm: { - allocateMoney: 0 - } + allocateMode: "uniform", + allocateMoney: 0, + importPreviewList: [] + }, + importFileList: [] } }, methods: { @@ -201,22 +245,100 @@ layout("/layouts/platform.html"){ this.$message.warning('当前没有可分配的工会记录，请先生成季度记录') return } - this.batchAllocateForm = { - allocateMoney: 0 + const quarter = this.$moment().quarter() + const openDialog = () => { + this.resetBatchAllocateForm() + this.batchAllocateDialogVisible = true } - this.batchAllocateDialogVisible = true + this.$axios.post("/platform/outlay/outlayManage/unionAllocate/hasAllocated", { + quarterly: quarter, + year: this.pageForm.year + }).then((resp) => { + if (resp.code !== 0) { + return + } + if (resp.data) { + this.$confirm('温馨提示：当前季度已分配过额度，再次分配将覆盖本季度原有分配结果，是否继续？', '温馨提示', { + confirmButtonText: '继续', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + openDialog() + }).catch(() => { + }) + } else { + openDialog() + } + }) + }, + resetBatchAllocateForm() { + this.batchAllocateForm = { + allocateMode: "uniform", + allocateMoney: 0, + importPreviewList: [] + } + this.importFileList = [] + }, + downloadImportTemplate() { + this.$downLoad("/platform/outlay/outlayManage/unionAllocate/downloadImportTemplate") + }, + beforeImportUpload(file) { + const suffix = file.name.split(".").pop() + if (["xls", "xlsx"].indexOf(suffix) === -1) { + this.$message.warning("请上传xls或xlsx格式文件") + return false + } + return true + }, + onImportSuccess(resp, file, fileList) { + this.importFileList = fileList.slice(-1) + if (resp.code === 0) { + this.$set(this.batchAllocateForm, "importPreviewList", resp.data || []) + } else { + this.$message.error(resp.msg) + this.importFileList = [] + this.$set(this.batchAllocateForm, "importPreviewList", []) + } + }, + onImportRemove() { + this.importFileList = [] + this.$set(this.batchAllocateForm, "importPreviewList", []) }, doBatchAllocate() { - if (!this.batchAllocateForm.allocateMoney || this.batchAllocateForm.allocateMoney <= 0) { - this.$message.warning('请输入有效的分配额度') + const quarter = this.$moment().quarter() + if (this.batchAllocateForm.allocateMode === "uniform") { + if (!this.batchAllocateForm.allocateMoney || this.batchAllocateForm.allocateMoney <= 0) { + this.$message.warning('请输入有效的分配额度') + return + } + this.formLoading = true + this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doBatchAllocate", { + allocateMoney: this.batchAllocateForm.allocateMoney, + quarterly: quarter, + year: this.pageForm.year + }).then((resp) => { + if (resp.code === 0) { + this.$message.success(resp.msg) + this.batchAllocateDialogVisible = false + this.doSearch() + } + }).finally(() => { + this.formLoading = false + }) + return + } + if (this.batchAllocateForm.importPreviewList.length === 0) { + this.$message.warning("请先上传导入文件") + return + } + const hasErrorRow = this.batchAllocateForm.importPreviewList.some((item) => item.errMsg) + if (hasErrorRow) { + this.$message.warning("导入数据存在校验未通过的记录，请修正后重新上传") return } - - const quarter = this.$moment().quarter() - this.formLoading = true - this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doBatchAllocate", { - allocateMoney: this.batchAllocateForm.allocateMoney, + this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doImportAllocate", { + data: JSON.stringify(this.batchAllocateForm.importPreviewList), quarterly: quarter, year: this.pageForm.year }).then((resp) => { diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html index 3f9704b5..e1191a6d 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html @@ -294,7 +294,8 @@ layout("/layouts/platform.html"){ @@ -312,6 +313,7 @@ layout("/layouts/platform.html"){ taskId: GetQueryString("taskId"), isShow: false, time: '', + blockMessage: '', formData: { id: GetQueryString("bizId"), mode: '1', @@ -602,7 +604,14 @@ layout("/layouts/platform.html"){ async getIsCanPlay() { this.$axios.post('/platform/difficultHelp/apply/getIsCanPlay').then(res => { if (res.code === 0) { - this.isShow = res.data.result + // 新增申请进入页面时，优先校验当前登录人本年度是否已经申请过，已申请则直接拦截新增。 + if (!this.bizId && res.data.hasCurrentYearApply) { + this.isShow = false + this.$set(this, 'blockMessage', '抱歉，您本年度已申请困难帮扶，不能重复申请。') + } else { + this.isShow = res.data.result + this.$set(this, 'blockMessage', '') + } this.$set(this, 'time', res.data.time); if (res.data.applyCount !== null && res.data.applyCount !== undefined && res.data.applyCount !== 0) { this.$set(this.formData, 'applyCount', res.data.applyCount) diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html index 49741e5c..b4c30f92 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html @@ -159,7 +159,7 @@ layout("/layouts/platform.html"){ { prop: "subsidyStandards", label: "困难类型", sortable: true }, { prop: "applyTime", label: "申请时间", sortable: true }, { prop: "applyCount", label: "申请次数", sortable: true }, - { prop: "taskName", label: "当前节点" }, + { prop: "curTaskName", label: "当前节点" }, { prop: "instanceState", label: "流程状态" } ], unions: [], diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html index 7a5174ae..a6507700 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html @@ -48,8 +48,9 @@ layout("/layouts/platform.html"){ 未审核 - + { - this.batchApprove(this.tableData); + this.batchApprove(this.selectData); }).catch(() => { }); @@ -279,6 +285,9 @@ layout("/layouts/platform.html"){ this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id) } }, + handleSelectionChange: function (val) { + this.selectData = val + }, }, async created() { this.pageData() From e8e39c128c017032c6e960afcfd7fc7eb13d4706 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Sat, 25 Apr 2026 14:51:03 +0800 Subject: [PATCH 3/9] 1 --- .../OutlayManageUnionAllocateService.java | 22 +++- .../OutlayManageUnionAllocateServiceImpl.java | 108 ++++++++++++++++-- .../OutlayManageUnionAllocateController.java | 74 ++---------- .../outlayManage/union/allocate/index.html | 68 +++++++++-- 4 files changed, 184 insertions(+), 88 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java index 8b8ac9f1..986186d8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java @@ -77,12 +77,26 @@ public interface OutlayManageUnionAllocateService extends BaseService重置时会先回滚 outlay_manage_union.totalQuota， - * 再将当前季度的 outlay_allocate_union 记录标记删除。

+ *

页面支持切换年度和季度，所以重置动作必须严格使用前端当前选择值， + * 不能再按系统当前自然季度处理，否则会出现页面筛选季度和实际重置季度不一致的问题。

* + * @param quarterly 要重置的季度，例如 1/2/3/4 + * @param year 要重置的年份 * @return Result 成功时返回 success；失败时返回错误信息 */ - Result deleteAllocateRecord(); + Result deleteAllocateRecord(Integer quarterly, Integer year); + + /** + * 按指定年度季度生成分工会预算记录。 + * + *

生成前会先校验该年度季度是否已存在有效记录； + * 若已存在，则直接提示前端需要先重置后再重新生成。

+ * + * @param quarterly 要生成的季度，例如 1/2/3/4 + * @param year 要生成的年份 + * @return Result 成功时返回 success；失败时返回错误信息 + */ + Result doAllocateRecord(Integer quarterly, Integer year); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java index 91af4325..ae2a70b1 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java @@ -60,6 +60,10 @@ public class OutlayManageUnionAllocateServiceImpl extends BaseServiceImpl allocateUnionList = dao().query(OutLayAllocateUnion.class, Cnd.where(OutLayAllocateUnion::getQuarterly, "=", quarterly) .and(OutLayAllocateUnion::getYear, "=", year) @@ -139,6 +143,10 @@ public class OutlayManageUnionAllocateServiceImpl extends BaseServiceImpl importList, Integer quarterly, Integer year) { + Result validateResult = validateCurrentQuarterOperation(quarterly); + if (validateResult != null) { + return validateResult; + } if (importList == null || importList.isEmpty()) { return Result.error("请先上传导入数据"); } @@ -208,11 +216,17 @@ public class OutlayManageUnionAllocateServiceImpl extends BaseServiceImpl allocateUnionList = dao().query(OutLayAllocateUnion.class, - Cnd.where(OutLayAllocateUnion::getQuarterly, "=", currentQuarter) - .and(OutLayAllocateUnion::getYear, "=", DateUtil.thisYear()) + Cnd.where(OutLayAllocateUnion::getQuarterly, "=", quarterly) + .and(OutLayAllocateUnion::getYear, "=", year) .and(OutLayAllocateUnion::getDelFlag, "=", false)); if (allocateUnionList == null || allocateUnionList.isEmpty()) { return Result.error("当前季度还未分配,无法重置！"); @@ -223,12 +237,38 @@ public class OutlayManageUnionAllocateServiceImpl extends BaseServiceImpl outlayManageUnionList = dao().query(OutlayManageUnion.class, + Cnd.where(OutlayManageUnion::getYear, "=", sourceYear)); + List insertList = buildAllocateUnionList(outlayManageUnionList, quarterly, year); + insert(insertList); + return Result.success(); + } + /** * 按“先回退旧额度，再写入新额度”的方式同步季度记录和年度预算表。 * @@ -239,7 +279,7 @@ public class OutlayManageUnionAllocateServiceImpl extends BaseServiceImpl 待插入的季度分配记录 + */ + private List buildAllocateUnionList(List outlayManageUnionList, Integer quarterly, Integer year) { + List unionList = dao().query(Sys_union.class, Cnd.NEW()); + List insertList = new ArrayList<>(); + for (Sys_union union : unionList) { + OutLayAllocateUnion allocateUnion = new OutLayAllocateUnion(); + allocateUnion.setYear(year); + allocateUnion.setQuarterly(quarterly); + allocateUnion.setUnionId(union.getId()); + allocateUnion.setAllocateMoney(BigDecimal.ZERO); + OutlayManageUnion outlayManageUnion = outlayManageUnionList.stream() + .filter(o -> o.getUnionId().equals(union.getId())) + .findFirst() + .orElse(null); + if (Lang.isNotEmpty(outlayManageUnion)) { + BigDecimal surplusMoney = defaultValue(outlayManageUnion.getTotalQuota()) + .subtract(defaultValue(outlayManageUnion.getUsedQuota())); + allocateUnion.setAllocateHeadMoney(surplusMoney); + } else { + allocateUnion.setAllocateHeadMoney(BigDecimal.ZERO); + } + insertList.add(allocateUnion); + } + return insertList; + } } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java index 27bd53fe..7ffa4b90 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java @@ -2,17 +2,13 @@ package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.controller; import com.budwk.app.base.utils.CommonDownloadUtil; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.sys.models.Sys_union; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayManageUnionAllocateService; -import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutLayAllocateUnion; -import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.vo.OutlayUnionAllocateImportVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,7 +33,6 @@ import org.nutz.mvc.annotation.AdaptBy; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; /** @@ -175,70 +170,23 @@ public class OutlayManageUnionAllocateController { @Aop(TransAop.READ_COMMITTED) @SLog(tag = "分工会预算-季度预算分配", msg = "重置预算季度记录") @SaCheckPermission("outlay.outlayManage.union.allocate") - public Result deleteAllocateRecord() { - return outlayManageUnionAllocateService.deleteAllocateRecord(); + public Result deleteAllocateRecord(@Param("quarterly") Integer quarterly, + @Param("year") Integer year) { + if (quarterly == null || year == null) { + return Result.error("参数错误！"); + } + return outlayManageUnionAllocateService.deleteAllocateRecord(quarterly, year); } @At @ApiOperation("预算季度记录生成") @SLog(tag = "分工会预算-季度预算分配", msg = "生成了预算分配记录") @SaCheckPermission("outlay.outlayManage.union.allocate") - public Result doAllocateRecord() { - int quarter = DateUtil.month(DateUtil.date()) / 3 + 1; - // 查询当前季度 - int count = baseService.dao().count(OutLayAllocateUnion.class, Cnd.where(OutLayAllocateUnion::getQuarterly, "=", quarter) - .and(OutLayAllocateUnion::getYear, "=", DateUtil.thisYear()) - .and(OutLayAllocateUnion::getDelFlag, "=", 0)); - if (count > 0) { - return Result.error("当前季度已分配,如需重新分配请点击重置分配记录！"); + public Result doAllocateRecord(@Param("quarterly") Integer quarterly, + @Param("year") Integer year) { + if (quarterly == null || year == null) { + return Result.error("参数错误！"); } - - List outlayManageUnionList; - if (quarter == 1) { - //如果是第一季度，查询去年剩余额度 - outlayManageUnionList = baseService.dao().query(OutlayManageUnion.class, - Cnd.where(OutlayManageUnion::getYear, "=", DateUtil.thisYear() - 1)); - } else { - //非第一季度 - outlayManageUnionList = baseService.dao().query(OutlayManageUnion.class, - Cnd.where(OutlayManageUnion::getYear, "=", DateUtil.thisYear())); - } - List insertList = this.initOutLayAllocateUnion(outlayManageUnionList); - baseService.insert(insertList); - return Result.success(); + return outlayManageUnionAllocateService.doAllocateRecord(quarterly, year); } - - - /** - * 初始化需要添加的数据 - * - * @param outlayManageUnionList - * @return - */ - public List initOutLayAllocateUnion(List outlayManageUnionList) { - int quarter = DateUtil.month(DateUtil.date()) / 3 + 1; - - List unionList = baseService.dao().query(Sys_union.class, Cnd.NEW()); - List insertList = new ArrayList<>(); - for (Sys_union union : unionList) { - OutLayAllocateUnion allocateUnion = new OutLayAllocateUnion(); - allocateUnion.setYear(DateUtil.thisYear()); - allocateUnion.setQuarterly(quarter); - allocateUnion.setUnionId(union.getId()); - allocateUnion.setAllocateMoney(BigDecimal.ZERO); - //根据院级工会ID查询 - OutlayManageUnion outlayManageUnion = outlayManageUnionList.stream().filter(o -> o.getUnionId().equals(union.getId())).findFirst().orElse(null); - if (Lang.isNotEmpty(outlayManageUnion)) { - BigDecimal surplusMoney = outlayManageUnion.getTotalQuota().subtract(outlayManageUnion.getUsedQuota()); - allocateUnion.setAllocateHeadMoney(surplusMoney); - } else { - allocateUnion.setAllocateHeadMoney(BigDecimal.ZERO); - } - insertList.add(allocateUnion); - - } - return insertList; - } - - } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html index a7cd5e53..9ea27294 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html @@ -186,6 +186,36 @@ layout("/layouts/platform.html"){ } }, methods: { + /** + * 确认提示文案优先展示页面当前筛选季度。 + * 未选择季度时再回退到系统当前自然季度，避免提示文案与用户当前查看条件不一致。 + */ + getPromptQuarter() { + return this.pageForm.quarterly || this.$moment().quarter() + }, + /** + * 季度记录生成、重置记录都要按页面当前筛选的年度和季度执行。 + * 这里统一封装请求参数，避免前后端再次出现“提示季度”和“实际执行季度”不一致的问题。 + */ + getCurrentQuarterParams() { + return { + quarterly: this.pageForm.quarterly || this.$moment().quarter(), + year: this.pageForm.year + } + }, + /** + * 生成、重置、一键分配都只允许操作当前自然季度。 + * 这里统一做前端入口校验，避免同类判断分散在多个按钮方法里难维护。 + */ + validateCurrentQuarterAction(actionName) { + const currentQuarter = this.$moment().quarter() + const selectedQuarter = Number(this.getCurrentQuarterParams().quarterly) + if (selectedQuarter !== currentQuarter) { + this.$message.warning('当前仅允许操作第' + currentQuarter + '季度' + actionName + '，请切换后再操作') + return false + } + return true + }, doEdit(row) { this.$confirm('确定要给【' + row.unionName + '】分配预算吗？', '提示', { confirmButtonText: '确定', @@ -207,13 +237,21 @@ layout("/layouts/platform.html"){ }) }, deleteAllocateRecord() { - this.$confirm('确定要重置【第' + this.$moment().quarter() + '季度】的预算记录吗？', '提示', { + if (!this.validateCurrentQuarterAction('记录重置')) { + return + } + // 重置动作以当前列表是否已有记录为前置条件，避免用户在空列表场景下误操作。 + if (this.tableData.length === 0) { + this.$message.warning('当前列表无可重置记录') + return + } + this.$confirm('确定要重置【第' + this.getPromptQuarter() + '季度】的预算记录吗？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { this.formLoading = true - this.$axios.post("/platform/outlay/outlayManage/unionAllocate/deleteAllocateRecord").then((resp) => { + this.$axios.post("/platform/outlay/outlayManage/unionAllocate/deleteAllocateRecord", this.getCurrentQuarterParams()).then((resp) => { if (resp.code === 0) { this.$message.success(resp.msg) this.doSearch() @@ -224,13 +262,16 @@ layout("/layouts/platform.html"){ }) }, doAllocateRecord() { - this.$confirm('确定要生成【第' + this.$moment().quarter() + '季度】的预算记录吗？', '提示', { + if (!this.validateCurrentQuarterAction('记录生成')) { + return + } + this.$confirm('确定要生成【第' + this.getPromptQuarter() + '季度】的预算记录吗？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { this.formLoading = true - this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doAllocateRecord").then((resp) => { + this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doAllocateRecord", this.getCurrentQuarterParams()).then((resp) => { if (resp.code === 0) { this.$message.success(resp.msg) this.doSearch() @@ -241,18 +282,21 @@ layout("/layouts/platform.html"){ }) }, showBatchAllocateDialog() { + if (!this.validateCurrentQuarterAction('一键分配')) { + return + } if (this.tableData.length === 0) { this.$message.warning('当前没有可分配的工会记录，请先生成季度记录') return } - const quarter = this.$moment().quarter() + const currentParams = this.getCurrentQuarterParams() const openDialog = () => { this.resetBatchAllocateForm() this.batchAllocateDialogVisible = true } this.$axios.post("/platform/outlay/outlayManage/unionAllocate/hasAllocated", { - quarterly: quarter, - year: this.pageForm.year + quarterly: currentParams.quarterly, + year: currentParams.year }).then((resp) => { if (resp.code !== 0) { return @@ -305,7 +349,7 @@ layout("/layouts/platform.html"){ this.$set(this.batchAllocateForm, "importPreviewList", []) }, doBatchAllocate() { - const quarter = this.$moment().quarter() + const currentParams = this.getCurrentQuarterParams() if (this.batchAllocateForm.allocateMode === "uniform") { if (!this.batchAllocateForm.allocateMoney || this.batchAllocateForm.allocateMoney <= 0) { this.$message.warning('请输入有效的分配额度') @@ -314,8 +358,8 @@ layout("/layouts/platform.html"){ this.formLoading = true this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doBatchAllocate", { allocateMoney: this.batchAllocateForm.allocateMoney, - quarterly: quarter, - year: this.pageForm.year + quarterly: currentParams.quarterly, + year: currentParams.year }).then((resp) => { if (resp.code === 0) { this.$message.success(resp.msg) @@ -339,8 +383,8 @@ layout("/layouts/platform.html"){ this.formLoading = true this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doImportAllocate", { data: JSON.stringify(this.batchAllocateForm.importPreviewList), - quarterly: quarter, - year: this.pageForm.year + quarterly: currentParams.quarterly, + year: currentParams.year }).then((resp) => { if (resp.code === 0) { this.$message.success(resp.msg) From f454b6d6c3ccfe0561e96aee5e96521e988e357b Mon Sep 17 00:00:00 2001 From: zhangrui Date: Sat, 25 Apr 2026 16:38:47 +0800 Subject: [PATCH 4/9] 1 --- .../components/module/userInfo/index.vue | 1 - .../views/platform/sys/data/user/pull.html | 8 ++--- .../views/platform/sys/data/user/update.html | 14 +++----- .../sys/msg/msgManage/msgManageForm.js | 7 ++-- .../sports/ActivityResults/index.html | 6 ++-- .../activity/sports/applyUser/applyUser.js | 8 ++--- .../activity/sports/infoManage/addActivity.js | 5 +-- .../platform/zhgh/benefit/userList/index.html | 7 ++-- .../zhgh/benefit/userSelectionList/index.html | 7 ++-- .../zhgh/club/examine/common/examineInfo.js | 5 +-- .../club/infoManage/exitManage/index.html | 5 +-- .../club/infoManage/manage/clubInfoManage.js | 5 +-- .../fund/member/batchJoin/index.html | 12 +++---- .../fund/member/query/index.html | 12 +++---- .../healthCheckup/projectMange/index.html | 4 +-- .../dayofficework/integral/manage/index.html | 9 ++--- .../meeting/common/meetingInfo.js | 4 +-- .../dayofficework/meeting/manage/basicForm.js | 7 ++-- .../difficulthelp/apply/form.html | 2 +- .../maternityLeave/apply/index.html | 22 ++++++------ .../maternityLeave/common/info.js | 12 +++---- .../apply/branchunionapproval/index.html | 5 +-- .../member/apply/common/commonQuery.js | 7 ++-- .../staffmanage/member/apply/common/info.js | 4 +-- .../apply/common/memberApplyAuditInfo.js | 5 +-- .../staffmanage/member/apply/mine/index.html | 5 +-- .../apply/schoolunionapproval/index.html | 5 +-- .../staffmanage/member/apply/submit/form.html | 5 +-- .../member/apply/submit/index.html | 5 +-- .../apply/uniongroupapproval/index.html | 4 +-- .../staffmanage/member/apply/view/index.html | 5 +-- .../branch/verification/check/index.html | 10 +++--- .../member/change/branchunionaudit/index.html | 5 +-- .../member/change/common/commonQuery.js | 7 ++-- .../staffmanage/member/change/common/info.js | 4 +-- .../change/common/memberAllChangeInfo.js | 4 +-- .../member/change/common/memberChange.js | 9 ++--- .../member/change/manage/index.html | 9 ++--- .../staffmanage/member/change/mine/index.html | 5 +-- .../member/change/record/index.html | 9 ++--- .../member/change/schoolunionaudit/index.html | 5 +-- .../member/change/submit/form.html | 5 +-- .../member/change/submit/index.html | 5 +-- .../member/change/uniongroupaudit/index.html | 4 +-- .../staffmanage/member/change/view/index.html | 5 +-- .../member/common/info/memberInfo.js | 4 +-- .../member/common/manage/memberManageQuery.js | 9 ++--- .../member/common/manage/memberManageTable.js | 4 +-- .../verification/memberVerificationChange.js | 5 +-- .../member/info/batchmake/index.html | 5 +-- .../staffmanage/member/info/board/index1.html | 5 +-- .../member/info/common/commonQuery.js | 7 ++-- .../member/info/common/memberAddForm.js | 3 +- .../member/info/datamanage/index.html | 7 ++-- .../staffmanage/member/info/group/index.html | 5 +-- .../member/info/history/index.html | 15 +++----- .../staffmanage/member/info/input/index.html | 7 ++-- .../member/modelworker/manage/index.html | 9 ++--- .../verification/check/schoolViewAndHandle.js | 12 +++---- .../verification/check/viewChangeTypeUser.js | 12 +++---- .../verification/manage/verificationQuery.js | 7 ++-- .../manage/verificationSetUserList.js | 9 ++--- .../manage/verificationShowSelectionUsers.js | 12 +++---- .../statistics/comprehensive/index.html | 5 +-- .../statistics/comprehensive/queryForm.js | 31 +++-------------- .../zhgh/staffmanage/membercost/config.html | 5 +-- .../membercost/mine/minePayInfo.js | 5 +-- .../zhgh/staffmanage/membercost/summary.html | 9 ++--- .../zhgh/staffmanage/membercost/user.html | 7 ++-- .../personnelcheck/common/commonQuery.js | 9 ++--- .../personnelcheck/manage/add/importAndMap.js | 4 +-- .../singleTeacher/ledger/index.html | 9 ++--- .../sourcechange/manage/index.html | 9 ++--- .../specialstaff/manage/index.html | 9 ++--- .../staffmanage/thirtyTeach/manage/index.html | 11 +++--- .../zhgh/welfare/projectMange/filterUser.js | 8 ----- .../zhgh/welfare/statistics/selectedUser.js | 4 +-- .../zhgh/welfare/statistics/unSelectedUser.js | 4 +-- .../zhgh/welfare/welfareUser/addUser.js | 8 ----- .../zhgh/welfare/welfareUser/index.html | 11 ------ .../difficulthelp/apply/index.html | 2 +- .../maternityLeave/apply/index.html | 34 +++++++++---------- .../maternityLeave/common/info.js | 12 +++---- .../staffmanage/member/apply/common/info.js | 1 - .../member/apply/submit/index.html | 11 ++---- .../member/common/mobileMemberChangeInfo.js | 4 +-- .../member/common/mobileMemberInfo.js | 5 +-- .../staffmanage/memberCost/summary.html | 5 +-- .../views/platform/zhghh5/sys/home/mine.js | 8 ++--- 89 files changed, 299 insertions(+), 366 deletions(-) diff --git a/src/main/resources/static/components/module/userInfo/index.vue b/src/main/resources/static/components/module/userInfo/index.vue index 1e96106e..0c61870a 100644 --- a/src/main/resources/static/components/module/userInfo/index.vue +++ b/src/main/resources/static/components/module/userInfo/index.vue @@ -22,7 +22,6 @@ {{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format("YYYY-MM-DD") : null }} {{ viewData.identityType }} - {{ viewData.preparedBy }} {{ viewData.personType }} {{ viewData.userState }} diff --git a/src/main/resources/views/platform/sys/data/user/pull.html b/src/main/resources/views/platform/sys/data/user/pull.html index df21324a..12780ca3 100644 --- a/src/main/resources/views/platform/sys/data/user/pull.html +++ b/src/main/resources/views/platform/sys/data/user/pull.html @@ -1,4 +1,4 @@ - @@ -52,7 +52,7 @@ layout("/layouts/platform.html"){ - + @@ -77,8 +77,7 @@ layout("/layouts/platform.html"){ - - + @@ -209,3 +208,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/sys/data/user/update.html b/src/main/resources/views/platform/sys/data/user/update.html index 5f394ac2..2f416a86 100644 --- a/src/main/resources/views/platform/sys/data/user/update.html +++ b/src/main/resources/views/platform/sys/data/user/update.html @@ -1,4 +1,4 @@ - @@ -39,10 +39,7 @@ layout("/layouts/platform.html"){ - - - - + @@ -72,8 +69,7 @@ layout("/layouts/platform.html"){ - - + @@ -162,9 +158,8 @@ layout("/layouts/platform.html"){ { label: "生日", value: "birthday" }, { label: "手机号", value: "mobile" }, { label: "在职状态", value: "userState" }, - { label: "编制类别", value: "preparedBy" }, { label: "进站时间", value: "postDoctoralJoinDate" }, - { label: "教职工类别", value: "personType" }, + { label: "人员类型", value: "personType" }, { label: "来校年月", value: "arrivalAtSchoolDate" }, { label: "单位", value: "unitName" }, { label: "单位编码", value: "unitId" }, @@ -314,3 +309,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js b/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js index c7fab10f..560ed3b7 100644 --- a/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js +++ b/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js @@ -30,8 +30,7 @@ const MSG_FORM_TEMPLATE = { - - + @@ -93,8 +92,7 @@ const MSG_FORM_TEMPLATE = { - - + @@ -262,3 +260,4 @@ const MSG_FORM_TEMPLATE = { this.roleList = await this.getRoleList() } } + diff --git a/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html b/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html index b521ef98..7879f634 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html +++ b/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html @@ -394,8 +394,8 @@ layout("/layouts/platform.html"){ - 男性 - 女性 + 男 + 女 @@ -522,7 +522,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, "awardsMode", this.awardsMode) this.$set(this.formData, "identity", ['1']) this.$set(this.formData, "status", 2) - this.$set(this.formData, "sex", "男性") + this.$set(this.formData, "sex", "男") this.dialogVisible = true if (this.$refs['form']) { this.$refs['form'].resetFields() diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js index 255f893f..07824bf4 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js +++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js @@ -586,13 +586,13 @@ var ACTIVITY_SPORTS_APPLY_USER = { message = teamName + "替补最多设置" + substituteNum + "人" break } - const womanYdyNum = teamApplyData[i].filter((v) => ["女", "女性"].includes(v.sex) && v.identity.includes("1")).length + const womanYdyNum = teamApplyData[i].filter((v) => ["女"].includes(v.sex) && v.identity.includes("1")).length if (restrictGirlNum > 0 && womanYdyNum < restrictGirlNum) { msgFlag = false message = teamName + "女运动员至少设置" + restrictGirlNum + "人" break } - const manYdyNum = teamApplyData[i].filter((v) => ["男", "男性"].includes(v.sex) && v.identity.includes("1")).length + const manYdyNum = teamApplyData[i].filter((v) => ["男"].includes(v.sex) && v.identity.includes("1")).length if (restrictBoyNum > 0 && manYdyNum < restrictBoyNum) { msgFlag = false message = teamName + "男运动员至少设置" + restrictBoyNum + "人" @@ -675,7 +675,7 @@ var ACTIVITY_SPORTS_APPLY_USER = { ) { this.$notify({ title: "警告", - message: "该项目暂不支持男性运动员报名", + message: "该项目暂不支持男运动员报名", type: "warning" }) return @@ -689,7 +689,7 @@ var ACTIVITY_SPORTS_APPLY_USER = { ) { this.$notify({ title: "警告", - message: "该项目暂不支持女性运动员报名", + message: "该项目暂不支持女运动员报名", type: "warning" }) return diff --git a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js index c80a04bd..5afc5062 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js @@ -1,4 +1,4 @@ -let ACTIVITY_SPORTS_ADD_ACTIVITY = { +let ACTIVITY_SPORTS_ADD_ACTIVITY = { template: `
@@ -1193,7 +1193,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = { options: [{label: '男', value: '男'}, {label: '女', value: '女'}] }, {label: '在职状态', value: 'userState', type: "select", options: userStateOptions}, - {label: '教职工类别', value: 'personType', type: "select", options: personTypeOptions}, + {label: '人员类型', value: 'personType', type: "select", options: personTypeOptions}, ]*/ } }, @@ -1206,3 +1206,4 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = { this.unitOptions = this.clubOptions.concat(units) } } + diff --git a/src/main/resources/views/platform/zhgh/benefit/userList/index.html b/src/main/resources/views/platform/zhgh/benefit/userList/index.html index 007f24d0..dbae3545 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userList/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userList/index.html @@ -1,4 +1,4 @@ - @@ -52,7 +52,7 @@ layout("/layouts/platform.html"){ - + @@ -124,7 +124,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名" }, { prop: "sex", label: "性别", sortable: true }, { prop: "mobile", label: "联系方式" }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true } @@ -218,3 +218,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html b/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html index 4c898d44..a93f760f 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html @@ -1,4 +1,4 @@ - @@ -59,7 +59,7 @@ layout("/layouts/platform.html"){ - + @@ -192,7 +192,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号" }, { prop: "userName", label: "姓名" }, { prop: "sex", label: "性别", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -258,3 +258,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js b/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js index d7b94457..cf32b907 100644 --- a/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js +++ b/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js @@ -1,4 +1,4 @@ -const EXAMINE_INFO_COMPONENT = { +const EXAMINE_INFO_COMPONENT = { template: `
@@ -19,7 +19,7 @@ const EXAMINE_INFO_COMPONENT = {
社团成员变化情况
- + @@ -196,3 +196,4 @@ const EXAMINE_INFO_COMPONENT = { } ` } + diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html index eb0994fd..5ab88f44 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html +++ b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html @@ -1,4 +1,4 @@ - @@ -16,7 +16,7 @@ layout("/layouts/platform.html"){ - + @@ -98,3 +98,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js index 7630b591..9ce01b83 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js +++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js @@ -1,4 +1,4 @@ -const CLUB_INFO_MANAGE_TEMPLATE = { +const CLUB_INFO_MANAGE_TEMPLATE = { template: `
@@ -6,7 +6,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = { - + @@ -353,3 +353,4 @@ const CLUB_INFO_MANAGE_TEMPLATE = { await this.pageData() } } + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html index 327267d6..37dd83db 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html @@ -35,14 +35,10 @@ layout("/layouts/platform.html"){ - - + - - - @@ -105,8 +101,7 @@ layout("/layouts/platform.html"){ { label: "性别", prop: "sex" }, { label: "出生年月", prop: "birthday" }, { label: "在职状态", prop: "userState", sortable: true }, - { label: "教职工类别", prop: "personType", sortable: true }, - { label: '编制类别', prop: 'preparedBy', sortable: true }, + { label: "人员类型", prop: "personType", sortable: true }, { label: "所属工会", prop: "unionName" }, { label: "所属单位", prop: "unitName" }, ], @@ -183,3 +178,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html index 71d31ac5..7e99325e 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html @@ -39,14 +39,10 @@ layout("/layouts/platform.html"){ - - + - - - @@ -113,8 +109,7 @@ layout("/layouts/platform.html"){ { label: "性别", prop: "sex" }, { label: "出生年月", prop: "birthday" }, { label: "在职状态", prop: "userState", sortable: true }, - { label: "教职工类别", prop: "personType", sortable: true }, - { label: '编制类别', prop: 'preparedBy', sortable: true }, + { label: "人员类型", prop: "personType", sortable: true }, { label: "所属工会", prop: "unionName" }, { label: "所属单位", prop: "unitName" }, { label: "加入时间", prop: "joinTime" }, @@ -219,3 +214,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html index 1283eaae..25343df5 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html @@ -436,8 +436,7 @@ layout("/layouts/platform.html"){ {label: "年龄", value: "age"}, {label: "婚姻状况", value: "marriage"}, {label: "在职状态", value: "userState"}, - {label: "编制类别", value: "preparedBy"}, - {label: "教职工类别", value: "personType"}, + {label: "人员类型", value: "personType"}, ], conditionGroup: { logic: "AND", @@ -701,3 +700,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html index 52baa0d4..f7239082 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html @@ -1,4 +1,4 @@ -
@@ -43,8 +43,8 @@ layout("/layouts/platform.html"){ - - + @@ -249,7 +249,7 @@ layout("/layouts/platform.html"){ {prop: 'username', label: '姓名', sortable: true}, {prop: 'sex', label: '性别'}, {prop: 'mobile', label: '联系电话'}, - {prop: 'personType', label: '教职工类别', sortable: true}, + {prop: 'personType', label: '人员类型', sortable: true}, {prop: 'userState', label: '在职状态', sortable: true}, {prop: 'unionName', label: '所属工会', sortable: true}, {prop: 'unitName', label: '所属单位', sortable: true}, @@ -460,3 +460,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js b/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js index 8cc0636b..3b2405ce 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js @@ -31,8 +31,7 @@ const meetingInfo = { - - + @@ -68,3 +67,4 @@ const meetingInfo = { } ` } + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js index 79f9352d..e80dee10 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js @@ -114,8 +114,7 @@ const basicForm = { - - + @@ -178,8 +177,7 @@ const basicForm = { - - + @@ -394,3 +392,4 @@ const basicForm = { ` } + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html index e2a24d15..b504b0e5 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html @@ -44,7 +44,7 @@ - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html index 6724776c..8f4748f0 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html @@ -215,13 +215,13 @@ layout("/layouts/platform.html"){ return total; }, - // 是否为男性 + // 是否为男 isMale() { - return this.formData.sex === '男性' || this.formData.sex === '男'; + return this.formData.sex === '男'; }, - // 是否为女性 + // 是否为女 isFemale() { - return this.formData.sex === '女性' || this.formData.sex === '女'; + return this.formData.sex === '女'; }, }, watch: { @@ -237,7 +237,7 @@ layout("/layouts/platform.html"){ // 监听性别变化，设置默认值 isMale(newVal) { if (newVal) { - // 男性默认设置 + // 男默认设置 this.$set(this.formData, 'loverSex', '女'); this.$set(this.formData, 'withLeave', 15); this.$set(this.formData, 'parentalLeave', 10); @@ -245,7 +245,7 @@ layout("/layouts/platform.html"){ }, isFemale(newVal) { if (newVal) { - // 女性默认设置 + // 女默认设置 this.$set(this.formData, 'loverSex', '男'); this.$set(this.formData, 'maternityLeave', 98); this.$set(this.formData, 'extendLeave', 60); @@ -255,7 +255,7 @@ layout("/layouts/platform.html"){ methods: { // 计算休假时间止 calculateEndTime() { - // 如果是男性，则不自动计算结束时间 + // 如果是男，则不自动计算结束时间 if (this.isMale) { return; } @@ -372,19 +372,19 @@ layout("/layouts/platform.html"){ } // 根据性别设置默认值 if (this.isMale) { - // 男性默认设置 + // 男默认设置 this.$set(this.formData, 'loverSex', '女'); this.$set(this.formData, 'withLeave', 15); this.$set(this.formData, 'parentalLeave', 10); - // 男性默认产假和延长假为0，因为男性不休产假 + // 男默认产假和延长假为0，因为男不休产假 this.$set(this.formData, 'maternityLeave', 0); this.$set(this.formData, 'extendLeave', 0); } else if (this.isFemale) { - // 女性默认设置 + // 女默认设置 this.$set(this.formData, 'loverSex', '男'); this.$set(this.formData, 'maternityLeave', 98); this.$set(this.formData, 'extendLeave', 60); - // 女性默认陪产假和育儿假为0 + // 女默认陪产假和育儿假为0 this.$set(this.formData, 'withLeave', 0); this.$set(this.formData, 'parentalLeave', 0); } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js index fd48b9db..4c092b4f 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js @@ -21,22 +21,22 @@ const maternityLeaveInfo = { - + {{viewData.withLeave}} - + {{viewData.parentalLeave}} - + {{viewData.maternityLeave}} - + {{viewData.extendLeave}} - + {{viewData.birthsLeave}} - + {{viewData.difficultLeave}} {{viewData.winterLeave}} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html index fcd83796..d3b4563f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html @@ -1,4 +1,4 @@ -
@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - // { prop: "personType", label: "教职工类别", sortable: true }, + // { prop: "personType", label: "人员类型", sortable: true }, // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -194,3 +194,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js index da81b45e..586cb59c 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js @@ -1,4 +1,4 @@ -const COMMON_QUERY = { +const COMMON_QUERY = { template: /*language=HTML*/ ` @@ -27,8 +27,8 @@ const COMMON_QUERY = { - - + @@ -99,3 +99,4 @@ const COMMON_QUERY = { this.initData() } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js index 653ebb8e..a5b34ce3 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js @@ -27,8 +27,7 @@ const INFO = { {{ viewData.userState }} - - {{ viewData.preparedBy }} + {{ viewData.marriage }} {{ viewData.arrivalAtSchoolDate }} @@ -147,3 +146,4 @@ const INFO = { } } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js index 3f316c99..46d8c947 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js @@ -1,4 +1,4 @@ -const MEMBER_APPLY_AUDIT_INFO = { +const MEMBER_APPLY_AUDIT_INFO = { template: /*language=HTML*/ `
@@ -25,7 +25,7 @@ const MEMBER_APPLY_AUDIT_INFO = { {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} @@ -125,3 +125,4 @@ const MEMBER_APPLY_AUDIT_INFO = { } } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html index c15b5a63..02450bbb 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html @@ -1,4 +1,4 @@ -
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - // { prop: "personType", label: "教职工类别", sortable: true }, + // { prop: "personType", label: "人员类型", sortable: true }, // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -161,3 +161,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html index f8db9ec9..876d9d4b 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html @@ -1,4 +1,4 @@ -
@@ -120,7 +120,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -225,3 +225,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html index fc190816..0c7ad0b1 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html @@ -1,4 +1,4 @@ -
+
@@ -90,7 +90,7 @@ disabled style="width: 100%"> - + @@ -464,3 +464,4 @@ } }) + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index 59935dc6..9e0bbe7f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -1,4 +1,4 @@ -
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){ disabled style="width: 100%"> - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html index 67c7e7b9..a7d5edbb 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html @@ -104,8 +104,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "sign", label: "签字" }, @@ -196,3 +195,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html index 8f8b6c57..7bb2f66c 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html @@ -1,4 +1,4 @@ -
+
{{ viewData.loginname }} {{ viewData.username }} @@ -21,7 +21,7 @@ {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} @@ -142,3 +142,4 @@ width: 15%; } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html index e6c7cbcc..d9ac057d 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html @@ -42,11 +42,8 @@ layout("/layouts/platform.html"){ - - - - - + + @@ -246,7 +243,7 @@ layout("/layouts/platform.html"){ { prop: "sex", label: "性别", sortable: true, width: "100px" }, { prop: "userState", label: "在职状态", sortable: true }, // {prop: "preparedBy", label: "编制类别", sortable: true}, - // {prop: 'personType', label: '教职工类别', sortable: true}, + // {prop: 'personType', label: '人员类型', sortable: true}, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "isChanged", label: "变更状态", sortable: true }, @@ -549,3 +546,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html index 641ab471..34c8f7b3 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html @@ -1,4 +1,4 @@ - @@ -94,7 +94,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { prop: "sex", label: "性别", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, // { prop: 'preparedBy', label: '编制类别', sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -204,3 +204,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js index 21269146..b52712c9 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js @@ -1,4 +1,4 @@ -const COMMON_QUERY = { +const COMMON_QUERY = { template: /*language=HTML*/ ` @@ -22,8 +22,8 @@ const COMMON_QUERY = { - - + @@ -97,3 +97,4 @@ const COMMON_QUERY = { this.initData() } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js index d258e01b..ac36ca6f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js @@ -30,8 +30,7 @@ const INFO = { {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} - {{ viewData.preparedBy }} + {{ viewData.personType }}