30教龄教职工管理：搜索栏改动从会员管理搬来综合查询的搜索项（性别，在职状态，教职工类别，编制类别；）,保留平铺样式(单选改成多选);

2026-06-08 16:22:04 +08:00
parent 544c96f5ce
commit cc8f4a1732
3 changed files with 296 additions and 28 deletions
@@ -3,6 +3,8 @@ package com.budwk.app.zhgh.staffmanage.thirtyTeach.param;
 import com.budwk.app.base.param.PageForm;
 import lombok.Data;

+import java.util.List;
+
 /**
 * @author zhf
 * @date 2025/7/28 10:09
@@ -15,6 +17,13 @@ public class ThirtyTeachPageForm extends PageForm {
    private String unitId;
    //进校时长
    private String teachNum;
+    private List<String> sexTypes;
+    private List<String> personTypes;
+    private List<String> userStates;
+    private List<String> preparedBys;
+    //入校时间
+    private String arrivalAtSchoolDateStart;
+    private String arrivalAtSchoolDateEnd;
    //教龄标签
    private String teachYearTag;
    //截止日期
@@ -17,6 +17,7 @@ import org.nutz.ioc.loader.annotation.IocBean;

 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.List;

 /**
 * @author zhf
@@ -82,6 +83,20 @@ public class ThirtyTeachServiceImpl extends BaseServiceImpl implements ThirtyTea
        }
        cnd.andEX("unionId", "=", pageForm.getUnionId());
        cnd.andEX("unitId", "=", pageForm.getUnitId());
+        if (isNotEmpty(pageForm.getSexTypes())) {
+            cnd.and("sex", "in", pageForm.getSexTypes());
+        }
+        if (isNotEmpty(pageForm.getPersonTypes())) {
+            cnd.and("personType", "in", pageForm.getPersonTypes());
+        }
+        if (isNotEmpty(pageForm.getUserStates())) {
+            cnd.and("userState", "in", pageForm.getUserStates());
+        }
+        if (isNotEmpty(pageForm.getPreparedBys())) {
+            cnd.and("preparedBy", "in", pageForm.getPreparedBys());
+        }
+        cnd.andEX("arrivalAtSchoolDate", ">=", pageForm.getArrivalAtSchoolDateStart());
+        cnd.andEX("arrivalAtSchoolDate", "<=", pageForm.getArrivalAtSchoolDateEnd());
        cnd.andEX("personType", "=", pageForm.getPersonType());
        cnd.andEX("userState", "=", pageForm.getUserState());
        cnd.and(Cnd.likeEX("thirtyCertificateProcessingTime",pageForm.getThirtyCertificateProcessingTime()));
@@ -104,4 +119,8 @@ public class ThirtyTeachServiceImpl extends BaseServiceImpl implements ThirtyTea
        }
        return "CURDATE()";
    }
+
+    private boolean isNotEmpty(List<String> values) {
+        return values != null && !values.isEmpty();
+    }
 }