commit

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());
     }

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("在职状态")

src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java

@@ -21,7 +21,7 @@ public interface SysDataUserPullService extends BaseService<Sys_user_source> {
     Map<String, Date> pullPostDoctoral();
 
     /**
-     * 获取下拉框数据(单位、在职状态、人事编制、人员类型)
+     * 获取下拉框数据(单位、在职状态、编制类别、教职工类别)
      */
     NutMap searchOptions();
 

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);
     }
 

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));

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));

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;
 

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java

@@ -129,7 +129,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
         labelList.add(NutMap.NEW().addv("label", "姓名").addv("prop", "userName"));
         labelList.add(NutMap.NEW().addv("label", "联系电话").addv("prop", "mobile"));
         labelList.add(NutMap.NEW().addv("label", "身份证").addv("prop", "idCard").addv("width", 20));
-        labelList.add(NutMap.NEW().addv("label", "人员类型").addv("prop", "personType"));
+        labelList.add(NutMap.NEW().addv("label", "教职工类别").addv("prop", "personType"));
         labelList.add(NutMap.NEW().addv("label", "工会").addv("prop", "unionName"));
         labelList.add(NutMap.NEW().addv("label", "单位").addv("prop", "unitName"));
         return labelList;

src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralManageController.java

@@ -178,7 +178,7 @@ public class IntegralManageController {
      * @param year          年度
      * @param unionId       工会Id
      * @param unitId        单位Id
-     * @param personType    人员类型
+     * @param personType    教职工类别
      * @param userState     在职状态
      * @param integralTime  获取积分时间
      * @param response      response

src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralManageServiceImpl.java

@@ -55,7 +55,7 @@ public class IntegralManageServiceImpl extends BaseServiceImpl<IntegralDetail> 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) {

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));
 

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<NutMap> 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));
 

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;

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;

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<String> preparedBys;
 
-    // 人员类型
-    @ApiModelProperty("人员类型")
+    // 教职工类别
+    @ApiModelProperty("教职工类别")
     private List<String> personTypes;
 
 

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<String> preparedBys;
 
-    // 人员类型
-    @ApiModelProperty("人员类型")
+    // 教职工类别
+    @ApiModelProperty("教职工类别")
     private List<String> personTypes;
 
     @ApiModelProperty("年龄区间")
@@ -64,7 +64,7 @@ public class MemberCheckPageForm extends PageForm {
     @ApiModelProperty("性别")
     private List<String> sexTypes;
 
-    @ApiModelProperty("人员类型（会员、福利会员之类的）")
+    @ApiModelProperty("教职工类别（会员、福利会员之类的）")
     private List<String> userTypes;
 
     @ApiModelProperty("是否反选")

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<String> userIds;
+
     @ApiModelProperty("导出的数据")
     private List<Map<String, String>> columns;
 
@@ -96,6 +103,12 @@ public class MemberInfoPageForm extends PageForm {
             cnd = Cnd.NEW();
         }
 
+        if (Lang.isNotEmpty(this.getUserIds())) {
+            List<String> 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());

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("变更类型")

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java

@@ -225,7 +225,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> 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));

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberListVerificationServiceImpl.java

@@ -531,8 +531,8 @@ public class MemberListVerificationServiceImpl extends BaseServiceImpl<MemberLis
         exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
         exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
         exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
-        exportEntities.add(new ExcelExportEntity("人事编制", "preparedBy", 20));
-        exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
+        exportEntities.add(new ExcelExportEntity("编制类别", "preparedBy", 20));
+        exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
         exportEntities.add(new ExcelExportEntity("是否会员", "member", 15));
         exportEntities.add(new ExcelExportEntity("是否福利会员", "welfareMember", 15));
         return exportEntities;

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberModelWorkerServiceImpl.java

@@ -107,7 +107,7 @@ public class MemberModelWorkerServiceImpl extends BaseServiceImpl<Sys_user> 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));

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("单位编号")

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;
 

src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java

@@ -51,7 +51,7 @@ public class MemberPaymentServiceImpl extends BaseServiceImpl<MemberPaymentInfo>
         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));

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("在职状态")

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);

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;
 

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("编制类别")

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("编制类别")

src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java

@@ -104,7 +104,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
         List<ExcelExportEntity> 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<WelfareList> 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));