diff --git a/src/main/java/io/v/nutz/base/utils/CommonDownloadUtil.java b/src/main/java/io/v/nutz/base/utils/CommonDownloadUtil.java index fd153c5..0dc49e5 100644 --- a/src/main/java/io/v/nutz/base/utils/CommonDownloadUtil.java +++ b/src/main/java/io/v/nutz/base/utils/CommonDownloadUtil.java @@ -1,15 +1,3 @@ -/* - * Copyright [2022] [https://www.xiaonuo.vip] - * - * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip - */ package io.v.nutz.base.utils; import cn.hutool.core.io.FileUtil; diff --git a/src/main/java/io/v/nutz/base/utils/ExpressSelectUtil.java b/src/main/java/io/v/nutz/base/utils/ExpressSelectUtil.java index bda0d89..0c37052 100644 --- a/src/main/java/io/v/nutz/base/utils/ExpressSelectUtil.java +++ b/src/main/java/io/v/nutz/base/utils/ExpressSelectUtil.java @@ -26,7 +26,7 @@ public class ExpressSelectUtil { private static final String URL = "https://eolink.o.apispace.com/wlgj1/paidtobuy_api/trace_search"; //获取快递公司codeURL private static final String EXPRESS_COMPANY_URL = "https://eolink.o.apispace.com/wlgj1/paidtobuy_api/mail_discern"; - private static final String TOKEN = "vvzpibv7yzp2l89noyp8ut7tdjqqf1fq"; + private static final String TOKEN = "zjklldtxynqrusiedjm1meno83bfk5id"; public JSONObject getExpressInfo(String mailNo, String tel) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java index 9c52b09..0d928c8 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java @@ -176,6 +176,7 @@ public class ActivityUnionManageController { if (tissue.getIsEnrollSystem()) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); + sysHomeActivity.setEnable(ShiroUtil.hasAnyRoles("sysadmin,A06")); activitySchoolService.dao().insertOrUpdate(sysHomeActivity); } @@ -240,6 +241,11 @@ public class ActivityUnionManageController { tissue.setState(3); } activityTissueService.doEdit(tissue); + + if (tissue.getIsEnrollSystem()) { + Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); + activitySchoolService.dao().insertOrUpdate(sysHomeActivity); + } return null; } @@ -248,6 +254,7 @@ public class ActivityUnionManageController { @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR) public Object doDelete(String id) { activityTissueService.doDelete(id); + activityTissueService.dao().delete(Sys_home_activity.class, id); return null; } @@ -330,6 +337,7 @@ public class ActivityUnionManageController { u.unionname, u.sex, u.mobile, + u.idcard, atp.applyDateTime, IF(atp.isSign = 1, '已签到', '未签到') AS signState, signTime @@ -348,14 +356,17 @@ public class ActivityUnionManageController { ActivityTissue tissue = tissuePersonService.dao().fetch(ActivityTissue.class, Cnd.where("id", "=", id)); - List tissuePeople = tissuePersonService.listEntity(sql); + List tissuePeople = tissuePersonService.listMap(sql); List entityList = new ArrayList<>(); - entityList.add(new ExcelExportEntity("姓名", "userName", 20)); - entityList.add(new ExcelExportEntity("工号", "loginName", 20)); + entityList.add(new ExcelExportEntity("姓名", "username", 20)); + entityList.add(new ExcelExportEntity("工号", "loginname", 20)); entityList.add(new ExcelExportEntity("性别", "sex", 20)); entityList.add(new ExcelExportEntity("联系方式", "mobile", 20)); - entityList.add(new ExcelExportEntity("单位", "unitName", 20)); - entityList.add(new ExcelExportEntity("工会", "unionName", 20)); + if (ShiroUtil.hasAnyRoles("sysadmin, A06")) { + entityList.add(new ExcelExportEntity("身份证号", "idcard", 30)); + } + entityList.add(new ExcelExportEntity("单位", "unitname", 20)); + entityList.add(new ExcelExportEntity("工会", "unionname", 20)); if (isSign) { entityList.add(new ExcelExportEntity("签到状态", "singState", 20)); entityList.add(new ExcelExportEntity("签到时间", "signTime", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index c1e2d2f..34b06f9 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java @@ -532,17 +532,19 @@ public class SourceUserServiceImpl extends ViServiceImpl implements // 变更记录 List changeList = new ArrayList<>(); for (String fieldName : allowChangeFieldNames) { - if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) { - continue; - } +// if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) { +// continue; +// } +// +// if (List.of("education", "campus", "academicDegree").contains(fieldName)) { +// if (StrUtil.isNotBlank(sourceMap.getString(fieldName, "")) && StrUtil.isBlank(newMap.getString(fieldName, ""))) { +// continue; +// } +// } - if (List.of("education", "campus", "academicDegree").contains(fieldName)) { - if (StrUtil.isNotBlank(sourceMap.getString(fieldName, "")) && StrUtil.isBlank(newMap.getString(fieldName, ""))) { - continue; - } + if (List.of("unitId", "userState", "personType").contains(fieldName)) { + memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList); } - - memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList); } if (Lang.isEmpty(changeList)) { return null; @@ -587,16 +589,18 @@ public class SourceUserServiceImpl extends ViServiceImpl implements NutMap sourceMap = Lang.obj2nutmap(user); List changeList = new ArrayList<>(); for (String fieldName : allowChangeFieldNames) { - if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) { - continue; +// if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) { +// continue; +// } +// +// if (List.of("education", "campus", "academicDegree").contains(fieldName)) { +// if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) { +// continue; +// } +// } + if (List.of("unitId", "userState", "personType").contains(fieldName)) { + memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList); } - - if (List.of("education", "campus", "academicDegree").contains(fieldName)) { - if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) { - continue; - } - } - memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList); } if (Lang.isEmpty(changeList)) { return null; @@ -621,7 +625,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements * @param changeTypes */ private void commonCompareChange(UserSource source, Sys_user user, List changeTypes){ - changeTypes.add(MemberChangeType.BASIC_CHANGE.getType()); +// changeTypes.add(MemberChangeType.BASIC_CHANGE.getType()); if (!ObjectUtil.equals(user.getUserState(), source.getUserState())) { List list = Arrays.stream(MemberChangeType.values()) diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java index 60437b1..155be33 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalUnderTakeSummaryController.java @@ -273,7 +273,10 @@ public class ProposalUnderTakeSummaryController { LEFT JOIN sys_user u ON u.id = sur.userId $condition """); - sql.setParam("leaderRoleId", Roles.IN_CHARGE_LEADER); + // 分管校领导 +// sql.setParam("leaderRoleId", Roles.IN_CHARGE_LEADER); + // 承办单位负责人 + sql.setParam("leaderRoleId", Roles.CONTRACTOR_PERSON); Cnd cnd = Cnd.NEW(); cnd.and("pu.id", "in", unitIds); cnd.groupBy("pu.id"); @@ -287,7 +290,8 @@ public class ProposalUnderTakeSummaryController { sbf.append(unitMap.getString("unitName")); sbf.append("  "); sbf.append(""); - sbf.append(StrUtil.isBlank(unitMap.getString("username")) ? "未分配校领导" : unitMap.getString("username")); +// sbf.append(StrUtil.isBlank(unitMap.getString("username")) ? "未分配校领导" : unitMap.getString("username")); + sbf.append(StrUtil.isBlank(unitMap.getString("username")) ? "未分配承办单位负责人" : unitMap.getString("username")); sbf.append("  "); sbf.append(""); sbf.append(StrUtil.isBlank(unitMap.getString("mobile")) ? "暂无联系方式" : unitMap.getString("mobile")); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java index 77ce7cc..0551a70 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java @@ -166,6 +166,7 @@ public class MemberApplyBranchUnionAuditController { Sys_user sysUser = new Sys_user(); BeanUtil.copyProperties(record, sysUser); sysUser.setId(user.getId()); + sysUser.setWelfareMember(1); dao.updateIgnoreNull(sysUser); // 还要设置会员角色 diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberInquireIntegrateController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberInquireIntegrateController.java index 043759d..578b922 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberInquireIntegrateController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/inquire/MemberInquireIntegrateController.java @@ -496,10 +496,10 @@ public class MemberInquireIntegrateController { } if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { - cnd.and("unionid", "=", Vi.getUnionId()); + cnd.and("u.unionid", "=", Vi.getUnionId()); } - cnd.asc("unitcode"); - cnd.asc("unioncode"); + cnd.asc("u.unitcode"); + cnd.asc("u.unioncode"); cnd.asc("memberJoinTime"); cnd.groupBy("u.id"); sql.setCondition(cnd); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java index e445500..f7134a5 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java @@ -166,6 +166,7 @@ public class SourceChangeManageServiceImpl extends BaseServiceImpl { if (valid) { - const msg = '您确认要提交' + this.choose.courseName + '的报名吗？' + let msg = '您确认要提交' + this.choose.courseName + '的报名吗？' + if (this.choose.id === "76619f05ae904324930747087c408b5e") { + msg = "本人已认真阅读本次活动《安全告知书》，并确认自身身体状况可以参与活动方案提示的相关内容" + } this.$confirm(msg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/main/resources/views/platform/welfare/list/ListMange.html b/src/main/resources/views/platform/welfare/list/ListMange.html index 00a0bb2..4c8b671 100644 --- a/src/main/resources/views/platform/welfare/list/ListMange.html +++ b/src/main/resources/views/platform/welfare/list/ListMange.html @@ -267,13 +267,13 @@ layout("/layouts/platform.html"){ v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('H05')}"> 批量领取 --> - 导出报销表 - + --> + 导出名单 + @@ -827,6 +830,15 @@ layout("/layouts/platform.html"){ 'courier-number-info': httpVueLoader('/components/welfare/CourierNumberInfo.vue?v=' + new Date().getTime()) }, methods: { + doExportWelfareBySearch(){ + window.open(loc() + '/doExportWelfareBySearch?searchName=' + this.pageForm.searchName + + '&searchKeyWord=' + this.pageForm.searchKeyword + + '&projectId=' + this.pageForm.projectId + + '&unionId=' + this.pageForm.welfareUnit + + '&threeUnitId=' + this.pageForm.threeUnitId + + '&units=' + (this.pageForm.units ? JSON.stringify(this.pageForm.units) : null) + + "&isChoose=" + this.pageForm.isChoose) + }, async sendMsg(){ if (!this.pageForm.projectId) { this.$message.warning('请选择福利项目')