diff --git a/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java b/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java index 0a16c1a2..7b4880df 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java @@ -75,7 +75,7 @@ public class SysDataUserPullController { @At @SaCheckPermission("sys.data.user.pull") - @ApiModelProperty("获取下拉框数据(单位、在职状态、人员类型)") + @ApiModelProperty("获取下拉框数据(单位、在职状态、教职工类别)") public Result searchOptions() { return Result.success(sysUserPullService.searchOptions()); } diff --git a/src/main/java/com/budwk/app/sys/param/SysDataUserUpdatePageForm.java b/src/main/java/com/budwk/app/sys/param/SysDataUserUpdatePageForm.java index b7d6d3c5..82d2f3b0 100644 --- a/src/main/java/com/budwk/app/sys/param/SysDataUserUpdatePageForm.java +++ b/src/main/java/com/budwk/app/sys/param/SysDataUserUpdatePageForm.java @@ -20,10 +20,10 @@ public class SysDataUserUpdatePageForm extends PageForm { @ApiModelProperty("单位") private String unitId; - @ApiModelProperty("人员类型") + @ApiModelProperty("教职工类别") private String personType; - @ApiModelProperty("人事编制") + @ApiModelProperty("编制类别") private String preparedBy; @ApiModelProperty("在职状态") diff --git a/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java b/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java index 063b1ac6..d12dec1c 100644 --- a/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java +++ b/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java @@ -21,7 +21,7 @@ public interface SysDataUserPullService extends BaseService { Map pullPostDoctoral(); /** - * 获取下拉框数据(单位、在职状态、人事编制、人员类型) + * 获取下拉框数据(单位、在职状态、编制类别、教职工类别) */ NutMap searchOptions(); diff --git a/src/main/java/com/budwk/app/web/commons/proc/XssSqlFilterProcessor.java b/src/main/java/com/budwk/app/web/commons/proc/XssSqlFilterProcessor.java index 11d67826..0b7c7c7b 100644 --- a/src/main/java/com/budwk/app/web/commons/proc/XssSqlFilterProcessor.java +++ b/src/main/java/com/budwk/app/web/commons/proc/XssSqlFilterProcessor.java @@ -56,15 +56,15 @@ public class XssSqlFilterProcessor extends AbstractProcessor { } public void process(ActionContext ac) throws Throwable { - if (checkUrl(ac) && checkParams(ac)) { - if (WebUtil.isAjax(ac.getRequest())) { - ac.getResponse().addHeader("loginStatus", "paramsDenied"); - WebUtil.rendAjaxResp(ac.getRequest(), ac.getResponse(), Result.error(Mvcs.getMessage(ac.getRequest(), "system.paramserror"))); - } else { - new ForwardView(lerrorUri).render(ac.getRequest(), ac.getResponse(), Mvcs.getMessage(ac.getRequest(), "system.paramserror")); - } - return; - } +// if (checkUrl(ac) && checkParams(ac)) { +// if (WebUtil.isAjax(ac.getRequest())) { +// ac.getResponse().addHeader("loginStatus", "paramsDenied"); +// WebUtil.rendAjaxResp(ac.getRequest(), ac.getResponse(), Result.error(Mvcs.getMessage(ac.getRequest(), "system.paramserror"))); +// } else { +// new ForwardView(lerrorUri).render(ac.getRequest(), ac.getResponse(), Mvcs.getMessage(ac.getRequest(), "system.paramserror")); +// } +// return; +// } doNext(ac); } diff --git a/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserController.java b/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserController.java index a18b36ea..81e785be 100644 --- a/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserController.java +++ b/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserController.java @@ -130,7 +130,7 @@ public class BenefitUserController { exportEntities.add(new ExcelExportEntity("工号", "loginName", 20)); exportEntities.add(new ExcelExportEntity("姓名", "userName", 20)); exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); - exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); exportEntities.add(new ExcelExportEntity("所在分工会", "unionName", 20)); exportEntities.add(new ExcelExportEntity("所在部门", "unitName", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserSelectionListController.java b/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserSelectionListController.java index 3da74861..f03bae64 100644 --- a/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserSelectionListController.java +++ b/src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserSelectionListController.java @@ -70,7 +70,7 @@ public class BenefitUserSelectionListController { exportEntities.add(new ExcelExportEntity("工号", "loginName", 20)); exportEntities.add(new ExcelExportEntity("姓名", "userName", 20)); exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); - exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); exportEntities.add(new ExcelExportEntity("所在分工会", "unionName", 20)); exportEntities.add(new ExcelExportEntity("所在部门", "unitName", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/benefit/models/BenefitUser.java b/src/main/java/com/budwk/app/zhgh/benefit/models/BenefitUser.java index a9934a5b..740ba7cc 100644 --- a/src/main/java/com/budwk/app/zhgh/benefit/models/BenefitUser.java +++ b/src/main/java/com/budwk/app/zhgh/benefit/models/BenefitUser.java @@ -57,7 +57,7 @@ public class BenefitUser extends BaseModel { private String unionId; @Column - @Comment("人员类型") + @Comment("教职工类别") @ColDefine(type = ColType.VARCHAR) private String personType; diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java index e67576db..e2f6db8e 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java @@ -129,7 +129,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl i exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); // exportEntities.add(new ExcelExportEntity("身份证号", "idcard", 30)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); - exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30)); if (isSum) { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationEvaluateStatisticsController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationEvaluateStatisticsController.java index d4e6bc4a..45e5c279 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationEvaluateStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationEvaluateStatisticsController.java @@ -187,7 +187,7 @@ public class RecuperationEvaluateStatisticsController { entities.add(new ExcelExportEntity("所属单位", "unitname", 20)); entities.add(new ExcelExportEntity("所属工会", "unionname", 20)); entities.add(new ExcelExportEntity("在职状态", "userState", 20)); - entities.add(new ExcelExportEntity("人员类型", "personType", 20)); + entities.add(new ExcelExportEntity("教职工类别", "personType", 20)); entities.add(new ExcelExportEntity("评分", "evaluateScore", 20)); entities.add(new ExcelExportEntity("评价", "evaluateText", 40)); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java index ce3069e5..c8592b12 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java @@ -153,12 +153,12 @@ public class MemberBatchMakeController { unitName, mobile from - `user` + `vw_user` $condition """); Cnd cnd = Cnd.NEW(); cnd.and("member", "=", false); - pageForm.buildSearch(cnd, "u."); + pageForm.buildSearch(cnd, ""); sql.setCondition(cnd); List list = memberCommonService.listMap(sql); @@ -174,7 +174,7 @@ public class MemberBatchMakeController { exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); exportEntities.add(new ExcelExportEntity("编制类别", "preparedBy", 20)); - exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30)); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java index 49ee2c38..d30f06b5 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java @@ -127,13 +127,13 @@ public class MemberApplyRecord extends BaseModel { private String userState; @Column - @Comment("人事编制") + @Comment("编制类别") @ColDefine(type = ColType.VARCHAR, width = 50) @Size(max = 50) private String preparedBy; @Column - @Comment("人员类别") + @Comment("教职工类别") @ColDefine(type = ColType.VARCHAR, width = 50) @Size(max = 50) private String personType; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java index 75506ca5..638d8d51 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java @@ -125,13 +125,13 @@ public class MemberChangeRecord extends BaseModel { private String userState; @Column - @Comment("人事编制") + @Comment("编制类别") @ColDefine(type = ColType.VARCHAR, width = 50) @Size(max = 50) private String preparedBy; @Column - @Comment("人员类别") + @Comment("教职工类别") @ColDefine(type = ColType.VARCHAR, width = 50) @Size(max = 50) private String personType; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java index 8e6ab7fc..d859eb03 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java @@ -37,8 +37,8 @@ public class MemberChangePageForm extends PageForm { @ApiModelProperty("编制类别") private List preparedBys; - // 人员类型 - @ApiModelProperty("人员类型") + // 教职工类别 + @ApiModelProperty("教职工类别") private List personTypes; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberCheckPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberCheckPageForm.java index f2ec7347..a8221b10 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberCheckPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberCheckPageForm.java @@ -54,8 +54,8 @@ public class MemberCheckPageForm extends PageForm { @ApiModelProperty("编制类别") private List preparedBys; - // 人员类型 - @ApiModelProperty("人员类型") + // 教职工类别 + @ApiModelProperty("教职工类别") private List personTypes; @ApiModelProperty("年龄区间") @@ -64,7 +64,7 @@ public class MemberCheckPageForm extends PageForm { @ApiModelProperty("性别") private List sexTypes; - @ApiModelProperty("人员类型（会员、福利会员之类的）") + @ApiModelProperty("教职工类别（会员、福利会员之类的）") private List userTypes; @ApiModelProperty("是否反选") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java index d957c110..e85e464c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java @@ -12,9 +12,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.Cnd; import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.lang.Lang; +import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; /** * @version 1.0 @@ -55,7 +59,7 @@ public class MemberInfoPageForm extends PageForm { @ApiModelProperty("编制类别") private String preparedBy; - @ApiModelProperty("人员类型") + @ApiModelProperty("教职工类别") private String personType; @ApiModelProperty("人员类型数组") @@ -88,6 +92,9 @@ public class MemberInfoPageForm extends PageForm { @ApiModelProperty("工号结尾") private String endLoginNames; + @ApiModelProperty("查询账号") + private List userIds; + @ApiModelProperty("导出的数据") private List> columns; @@ -96,6 +103,12 @@ public class MemberInfoPageForm extends PageForm { cnd = Cnd.NEW(); } + if (Lang.isNotEmpty(this.getUserIds())) { + List userIds = Optional.ofNullable(this.getUserIds()).orElse(Collections.emptyList()) + .stream().filter(StrUtil::isNotBlank).toList(); + cnd.andEX(prefix + "id", "in", userIds); + } + if (StrUtil.isNotBlank(this.getSearchKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.orLike(prefix + "username", this.getSearchKeyword()); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberListVerificationPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberListVerificationPageForm.java index 7465c862..7829cccb 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberListVerificationPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberListVerificationPageForm.java @@ -34,13 +34,13 @@ public class MemberListVerificationPageForm extends PageForm { @ApiModelProperty("单位id") private String unitId; - @ApiModelProperty("人员类型") + @ApiModelProperty("教职工类别") private String personType; @ApiModelProperty("在职状态") private String userState; - @ApiModelProperty("人事编制") + @ApiModelProperty("编制类别") private String preparedBy; @ApiModelProperty("变更类型") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java index 1b296775..b295d4c5 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java @@ -225,7 +225,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl implements // exportEntities.add(new ExcelExportEntity("身份证号", "idCard", 30)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); exportEntities.add(new ExcelExportEntity("编制类别", "preparedBy", 20)); - exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30)); // exportEntities.add(new ExcelExportEntity("来校年月", "comeSchoolDate", 30)); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberListVerificationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberListVerificationServiceImpl.java index f5341531..74d43b27 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberListVerificationServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberListVerificationServiceImpl.java @@ -531,8 +531,8 @@ public class MemberListVerificationServiceImpl extends BaseServiceImpl impl exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); exportEntities.add(new ExcelExportEntity("身份证号", "idCard", 30)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); - exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30)); exportEntities.add(new ExcelExportEntity("是否为正式会员", "member", 10)); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/vo/MemberImportVo.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/vo/MemberImportVo.java index bf407578..9aa6ae76 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/vo/MemberImportVo.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/vo/MemberImportVo.java @@ -40,7 +40,7 @@ public class MemberImportVo { @ExcelProperty("在职状态") private String userState; - @ExcelProperty("人员类型") + @ExcelProperty("教职工类别") private String personType; @ExcelProperty("单位编号") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java index d136bdba..f63a48a4 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java @@ -92,7 +92,7 @@ public class MemberPaymentInfo extends BaseModel { private String paymentMonth; @Column - @Comment("人员类型") + @Comment("教职工类别") @ColDefine(type = ColType.VARCHAR, width = 20) private String personType; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java index 5a7d6a17..2ba00994 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java @@ -51,7 +51,7 @@ public class MemberPaymentServiceImpl extends BaseServiceImpl exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); // exportEntities.add(new ExcelExportEntity("身份证号", "idcard", 30)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); - exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("所属工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("所属单位", "unitname", 30)); exportEntities.add(new ExcelExportEntity("是否缴费", "isPay", 10)); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java index 1286c0d0..9cda3237 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java @@ -29,7 +29,7 @@ public class SingleTeacherPageForm extends PageForm { @ApiModelProperty("年龄范围") private Integer[] age; - @ApiModelProperty("人员类型") + @ApiModelProperty("教职工类别") private String personType; @ApiModelProperty("在职状态") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java index cb7c37dd..a36146fd 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java @@ -129,7 +129,7 @@ public class ThirtyTeachController { entityList.add(new ExcelExportEntity("工会", "unionName", 20)); entityList.add(new ExcelExportEntity("单位", "unitName", 20)); entityList.add(new ExcelExportEntity("在职状态", "userState", 20)); - entityList.add(new ExcelExportEntity("人员类型", "personType", 20)); + entityList.add(new ExcelExportEntity("教职工类别", "personType", 20)); entityList.add(new ExcelExportEntity("荣誉证办理年月", "thirtyCertificateProcessingTime", 20)); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java index 74ebcc60..c493fa97 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java @@ -63,7 +63,7 @@ public class WelfareList extends BaseModel{ private String welfareUnionName; @Column - @Comment("人员类型") + @Comment("教职工类别") @ColDefine(type = ColType.VARCHAR) private String personType; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java index d107d9d7..ace82c33 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java @@ -43,7 +43,7 @@ public class WelfareFilterUserPageForm extends PageForm { @ApiModelProperty("单位名称") private String unitName; - @ApiModelProperty("人员类型") + @ApiModelProperty("教职工类别") private String[] personTypes; @ApiModelProperty("编制类别") diff --git a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java index f2d3fb54..f19e2c77 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java @@ -46,7 +46,7 @@ public class WelfareListPageForm extends PageForm { @ApiModelProperty("单位名称") private String unitName; - @ApiModelProperty("人员类型") + @ApiModelProperty("教职工类别") private String[] personTypes; @ApiModelProperty("编制类别") diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java index 0006a127..51df60ff 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java @@ -104,7 +104,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); - exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20)); + exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("所在部门", "unitname", 20)); exportEntities.add(new ExcelExportEntity("份数", "selectNum", 20)); @@ -597,7 +597,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme entities.add(new ExcelExportEntity("姓名", "username", 20)); entities.add(new ExcelExportEntity("性别", "sex", 20)); entities.add(new ExcelExportEntity("出生日期", "birthday", 20)); - entities.add(new ExcelExportEntity("人员类型", "personType", 20)); + entities.add(new ExcelExportEntity("教职工类别", "personType", 20)); entities.add(new ExcelExportEntity("编制类别", "preparedBy", 20)); entities.add(new ExcelExportEntity("在职状态", "userState", 20)); entities.add(new ExcelExportEntity("所属工会", "welfareUnionName", 20)); diff --git a/src/main/resources/static/components/module/activity/UserDataScope.vue b/src/main/resources/static/components/module/activity/UserDataScope.vue index 5af64699..c56a7160 100644 --- a/src/main/resources/static/components/module/activity/UserDataScope.vue +++ b/src/main/resources/static/components/module/activity/UserDataScope.vue @@ -100,7 +100,7 @@ -->
-
人员类型：
+
教职工类别：
@@ -242,7 +242,7 @@ module.exports = { {prop: "sex", label: "性别", sortable: true}, {prop: "birthday", label: "出生年月"}, {prop: "mobile", label: "联系电话"}, - {prop: "personType", label: "人员类型", sortable: true}, + {prop: "personType", label: "教职工类别", sortable: true}, {prop: "userState", label: "在职状态", sortable: true}, {prop: "unitName", label: "所属单位", sortable: true}, {prop: "unionName", label: "所属工会", sortable: true}, diff --git a/src/main/resources/static/components/module/activity/UserScope.vue b/src/main/resources/static/components/module/activity/UserScope.vue index 2498136a..cb739cab 100644 --- a/src/main/resources/static/components/module/activity/UserScope.vue +++ b/src/main/resources/static/components/module/activity/UserScope.vue @@ -54,7 +54,7 @@ - 人员类型： + 教职工类别： {{$moment(row.birthday).format('YYYY-MM-DD')}} - + 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 dc166155..9e82af0c 100644 --- a/src/main/resources/views/platform/sys/data/user/update.html +++ b/src/main/resources/views/platform/sys/data/user/update.html @@ -39,10 +39,10 @@ layout("/layouts/platform.html"){ - + - + @@ -72,8 +72,8 @@ layout("/layouts/platform.html"){ - - + + @@ -155,9 +155,9 @@ layout("/layouts/platform.html"){ { label: "生日", value: "birthday" }, { label: "手机号", value: "mobile" }, { label: "在职状态", value: "userState" }, - { label: "人事编制", value: "preparedBy" }, + { label: "编制类别", value: "preparedBy" }, { label: "进站时间", value: "postDoctoralJoinDate" }, - { label: "人员类型", value: "personType" }, + { label: "教职工类别", value: "personType" }, { label: "来校年月", value: "arrivalAtSchoolDate" }, { label: "单位", value: "unitName" }, { label: "单位编码", value: "unitId" }, 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 443f5b80..c7fab10f 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,8 @@ const MSG_FORM_TEMPLATE = { - - + + @@ -93,8 +93,8 @@ const MSG_FORM_TEMPLATE = { - - + + 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 d01fed0d..dc6d0fa0 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 @@ -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}, ]*/ } }, diff --git a/src/main/resources/views/platform/zhgh/benefit/userList/addBenefitUserBySelect.js b/src/main/resources/views/platform/zhgh/benefit/userList/addBenefitUserBySelect.js index f33d1f5e..a1b9e70b 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userList/addBenefitUserBySelect.js +++ b/src/main/resources/views/platform/zhgh/benefit/userList/addBenefitUserBySelect.js @@ -27,7 +27,7 @@ let ADD_BENEFIT_USER_BY_SELECT = { - + 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 b73bfd2c..6a87447f 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userList/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userList/index.html @@ -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 } 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 eeccf071..f6060721 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html @@ -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 }, 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 4b34cf90..2cdde688 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 @@ -19,7 +19,7 @@ const EXAMINE_INFO_COMPONENT = { - + 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 ea98d61b..ce74af45 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 @@ -6,7 +6,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = { - + 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 9cc83866..dc868b58 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 @@ -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}, 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 b66fa35e..8cc0636b 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,8 @@ 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 bd8987f3..722ca17b 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,8 @@ const basicForm = { - - + + @@ -178,8 +178,8 @@ const basicForm = { - - + + 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 99fe4df0..d2f034b4 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 @@ -103,7 +103,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { 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: "sign", label: "签字" }, 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 81d51ed0..5ea02532 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 @@ -27,12 +27,12 @@ const COMMON_QUERY = { - - + - - + 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 1e88f3a6..51e6ea38 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,7 +27,7 @@ const INFO = { {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} 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 62b3f165..3f316c99 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 @@ -25,7 +25,7 @@ const MEMBER_APPLY_AUDIT_INFO = { {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} 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 bd44a09b..1366f2a4 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 @@ -86,7 +86,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { 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: "sign", label: "签字" }, 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 5574d957..c02f2526 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 @@ -121,7 +121,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { 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: "sign", label: "签字" }, 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 80b8a0b7..905f7cd3 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 @@ -90,7 +90,7 @@ disabled style="width: 100%"> - + 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 ec26b077..8504d35f 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 @@ -95,7 +95,7 @@ layout("/layouts/platform.html"){ disabled style="width: 100%"> - + 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 9c863bb6..c00dc499 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 @@ -21,7 +21,7 @@ {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} 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 b2967c33..eaf9bb3c 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 @@ -45,8 +45,8 @@ layout("/layouts/platform.html"){ - - + + @@ -246,7 +246,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 }, 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 34ca1839..698d5817 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 @@ -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: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "changeTypes", label: "变更类型", sortable: true, width: 200 }, 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 ee629f27..4a341d8f 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 @@ -22,14 +22,14 @@ const COMMON_QUERY = { - - - - - + + + + `, store, 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 e51960dc..d3bf9f4a 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,7 +30,7 @@ const INFO = { {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} {{ viewData.schoolTime }}