commit

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageManageController.java

@@ -0,0 +1,204 @@
+package com.budwk.app.zhgh.staffmanage.childManage.controller;
+
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.sys.models.Sys_dict;
+import com.budwk.app.sys.services.SysDictService;
+import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage;
+import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService;
+import com.budwk.app.zhgh.staffmanage.childManage.vo.ChildManagePageForm;
+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;
+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.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+@IocBean
+@At("/platform/childManage/manage")
+@Ok("json:full")
+@Slf4j
+@Api("子女信息管理")
+public class ChildManageManageController {
+
+    @Inject
+    private ChildManageService childManageService;
+    @Inject
+    private SysDictService sysDictService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/childManage/manage/index.html")
+    @SaCheckPermission
+    public void index() {}
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("childManage.manage")
+    public Result pageData(PageForm pageForm,
+                           Integer year,
+                           String searchName,
+                           String searchKeyword,
+                           String childrenName,
+                           String childrenSex,
+                           String unionId,
+                           String unitId,
+                           String childrenGrade) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*
+                FROM
+                  child_manage info   
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        // 模糊查询
+        if (searchName != null && !searchName.isEmpty() && searchKeyword != null && !searchKeyword.isEmpty()) {
+            switch (searchName) {
+                case "info.childrenName":
+                    cnd.and("info.childrenName", "like", "%" + searchKeyword + "%");
+                    break;
+                case "info.guardianUserName":  // 合并后的监护人查询
+                    cnd.and(Cnd.exps("info.guardianUserName1", "like", "%" + searchKeyword + "%")
+                            .or("info.guardianUserName2", "like", "%" + searchKeyword + "%"));
+                    break;
+            }
+        }
+
+        // 工会筛选 (查询两个监护人的工会)
+        if (unionId != null && !unionId.isEmpty()) {
+            cnd.and(Cnd.exps("info.guardianUnionId1", "=", unionId)
+                    .or("info.guardianUnionId2", "=", unionId));
+        }
+        // 所属单位筛选 (查询两个监护人的单位)
+        if (unitId != null && !unitId.isEmpty()) {
+            cnd.and(Cnd.exps("info.guardianUnitId1", "=", unitId)
+                    .or("info.guardianUnitId2", "=", unitId));
+        }
+        // 姓名筛选
+        if (childrenName != null && !childrenName.isEmpty()) {
+            cnd.and("info.childrenName", "like","%" + childrenName + "%" );
+        }
+        cnd.andEX("YEAR(info.applyTime)", "=", year);
+        cnd.andEX("info.childrenSex", "=", childrenSex);
+        cnd.andEX("info.childrenGrade", "=", childrenGrade);
+        sql.setCondition(cnd);
+        Pagination pagination = childManageService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+    @At
+    @ApiOperation("删除子女信息")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("childManage.manage")
+    @SLog(tag = "子女信息-我的填报", msg = "删除id: ${args[0]}")
+    public Result doDelete(String id) {
+        childManageService.dao().delete(ChildManage.class, id);
+        return Result.success();
+    }
+
+    @At
+    @Ok("void")
+    @SaCheckPermission("childManage.manage")
+    public void doExportExcel(@Param("data") ChildManagePageForm pageForm, HttpServletResponse response) {
+        try {
+            Sql sql = childManageService.getSql(pageForm);
+            List<NutMap> map = childManageService.listMap(sql);
+
+            List<Sys_dict> dictList = sysDictService.getSubListByCode("CHILD_MANAGE_GRADE");
+
+            map.forEach(item -> {
+                // 年龄计算
+                String birthday = item.getString("childrenBirthday");
+                if (birthday != null && !birthday.isEmpty()) {
+                    item.put("age", calculateAge(birthday));
+                }
+                Sys_dict dict = dictList.stream().filter(sys_dict -> sys_dict.getCode().equals(item.getString("childrenGrade"))).findFirst().orElse(null);
+                item.put("childrenGrade", dict.getName());
+            });
+
+            List<ExcelExportEntity> entityList = new ArrayList<>();
+            ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10);
+            no.setFormat("isAddIndex");
+            entityList.add(no);
+
+            entityList.add(new ExcelExportEntity("年级", "childrenGrade", 20));
+            entityList.add(new ExcelExportEntity("子女姓名", "childrenName", 20));
+            entityList.add(new ExcelExportEntity("性别", "childrenSex", 20));
+            entityList.add(new ExcelExportEntity("出生日期", "childrenBirthday", 20));
+            entityList.add(new ExcelExportEntity("年龄", "age", 20));
+            entityList.add(new ExcelExportEntity("就读学校", "childrenCurrentSchool", 20));
+            entityList.add(new ExcelExportEntity("监护人1", "guardianUserName1", 20));
+            entityList.add(new ExcelExportEntity("手机号码", "guardianMobile1", 20));
+            entityList.add(new ExcelExportEntity("所在单位", "guardianUnitName1", 20));
+            entityList.add(new ExcelExportEntity("监护人2", "guardianUserName2", 20));
+            entityList.add(new ExcelExportEntity("手机号码", "guardianMobile2", 20));
+            entityList.add(new ExcelExportEntity("所在单位", "guardianUnitName2", 20));
+
+
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("子女信息管理汇总.xlsx", "UTF-8"));
+            ExportParams exportParams = new ExportParams();
+            exportParams.setType(ExcelType.XSSF);
+            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, map);
+            workbook.write(response.getOutputStream());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    /**
+     * 计算年龄
+     * @param birthday 出生日期
+     * @return 年龄
+     */
+    private String calculateAge(String birthday) {
+        if (birthday == null || birthday.isEmpty()) {
+            return "";
+        }
+
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date birthDate = sdf.parse(birthday);
+            Calendar birthCal = Calendar.getInstance();
+            birthCal.setTime(birthDate);
+
+            Calendar today = Calendar.getInstance();
+            int age = today.get(Calendar.YEAR) - birthCal.get(Calendar.YEAR);
+
+            // 检查是否还没过生日
+            if (today.get(Calendar.DAY_OF_YEAR) < birthCal.get(Calendar.DAY_OF_YEAR)) {
+                age--;
+            }
+
+            return String.valueOf(age >= 0 ? age : 0);
+        } catch (Exception e) {
+            log.error("计算年龄失败", e);
+            return "";
+        }
+    }
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageMineController.java

@@ -0,0 +1,73 @@
+package com.budwk.app.zhgh.staffmanage.childManage.controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage;
+import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService;
+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.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;
+
+@IocBean
+@At("/platform/childManage/mine")
+@Ok("json:full")
+@Slf4j
+@Api("子女信息管理我的")
+public class ChildManageMineController {
+
+    @Inject
+    private ChildManageService childManageService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/childManage/mine/index.html")
+    @SaCheckPermission
+    public void index() {}
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("childManage.mine")
+    public Result pageData(PageForm pageForm, Integer year) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*
+                FROM
+                  child_manage info   
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("YEAR(info.applyTime)", "=", year);
+        // 使用 or 条件查询两个监护人字段
+        cnd.and(Cnd.exps("info.guardianUserId1", "=", SecurityUtil.getUserId())
+                .or("info.guardianUserId2", "=", SecurityUtil.getUserId()));
+        sql.setCondition(cnd);
+        Pagination pagination = childManageService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @ApiOperation("删除子女信息")
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("childManage.mine")
+    @SLog(tag = "子女信息-我的填报", msg = "删除id: ${args[0]}")
+    public Result doDelete(String id) {
+        childManageService.dao().delete(ChildManage.class, id);
+        return Result.success();
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageWriteController.java

@@ -0,0 +1,119 @@
+package com.budwk.app.zhgh.staffmanage.childManage.controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+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.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.sys.views.View_user;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage;
+import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+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;
+
+@IocBean
+@At("/platform/childManage/write")
+@Ok("json:full")
+@Slf4j
+@Api("子女信息管理信息填写")
+public class ChildManageWriteController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private ChildManageService childManageService;
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/childManage/write/index.html")
+    @SaCheckPermission
+    public void index() {}
+
+    @At
+    @ApiOperation("保存子女信息")
+    @SaCheckPermission("childManage.write")
+    @SLog(tag = "子女信息管理-信息填写", msg = "保存子女信息")
+    public Result save(@Param("data") ChildManage childManage) {
+        if(StrUtil.isBlank(childManage.getId())) childManage.setApplyTime(DateUtil.now());
+        dao.insertOrUpdate(childManage);
+        return Result.success();
+    }
+
+    @At
+    @ApiOperation("查询用户")
+    @SaCheckPermission("childManage.write")
+    @SLog(tag = "查询用户", msg = "查询用户")
+    public Object listUser(String keyword) {
+        Sql sql = Sqls.create("""
+				select
+					id,
+					username as userName,
+					loginname as loginName,
+					sex,
+					mobile,
+					technicalTitle,
+					IFNULL(unitname, '暂无') as unitName,
+					unitid as unitId,
+					unionid as unionId,
+					unionname as unionName
+				from
+					vw_user
+				$condition
+				""");
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(keyword)) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or(View_user::getLoginname, "like", "%" + keyword + "%");
+            seg.or(View_user::getUsername, "like", "%" + keyword + "%");
+            cnd.and(seg);
+        }
+        if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            if(AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+                cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId());
+            } else {
+                cnd.and(View_user::getId, "=", SecurityUtil.getUserId());
+            }
+
+        }
+        sql.setCondition(cnd);
+        Pagination pagination = childManageService.listPageMap(1, 50, sql);
+        return Result.success(pagination.getList());
+    }
+
+    @At
+    @SaCheckLogin
+    @ApiOperation("查询身份证是否重复")
+    public Result getIsRepeatByIdCard(String idCard, String id) {
+        int count = childManageService.dao().count(ChildManage.class,
+                Cnd.where(ChildManage::getChildrenIdCard, "=", idCard)
+                        .and("YEAR(applyTime)", "=", DateUtil.thisYear())
+                        .andEX(ChildManage::getId, "!=", id));
+
+
+        return Result.success(count);
+    }
+
+    @At
+    @SaCheckLogin
+    public Result findOne(String id) {
+        return Result.success(childManageService.dao().fetch(ChildManage.class, id));
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageManageController.java

@@ -0,0 +1,20 @@
+package com.budwk.app.zhgh.staffmanage.childManage.h5controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+@IocBean
+@At("/platform/h5/childManage/manage")
+@Ok("json:full")
+@Slf4j
+public class H5ChildManageManageController {
+
+    @At("")
+    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/manage/index.html")
+    @SaCheckPermission("h5.childManage.manage")
+    public void index() {}
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageMineController.java

@@ -0,0 +1,27 @@
+package com.budwk.app.zhgh.staffmanage.childManage.h5controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+@IocBean
+@At("/platform/h5/childManage/mine")
+@Ok("json:full")
+@Slf4j
+public class H5ChildManageMineController {
+
+    @Inject
+    private ChildManageService childManageService;
+
+    @At("")
+    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/mine/index.html")
+    @SaCheckPermission("h5.childManage.mine")
+    public void index() {}
+
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageWriteController.java

@@ -0,0 +1,30 @@
+package com.budwk.app.zhgh.staffmanage.childManage.h5controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+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;
+
+/**
+ * @version 1.0
+ * @Author hqw
+ * @name：H5ChildManageController
+ * @Date 2025/9/4 8:52
+ * @注释
+ */
+@Slf4j
+@IocBean
+@Ok("json")
+@At("/platform/h5/childManage/write")
+public class H5ChildManageWriteController {
+
+    @At("")
+    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/write/index.html")
+    @SaCheckPermission("h5.childManage.write")
+    public void index() {
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/models/ChildManage.java

@@ -0,0 +1,186 @@
+package com.budwk.app.zhgh.staffmanage.childManage.models;
+
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @ClassName ChildManage
+ * @Author hongqiwei
+ * @Date 2025/8/30 10:23
+ * @Version 1.0
+ * @Description TODO
+ */
+
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("child_manage")
+@TableMeta("{'mysql-charset':'utf8mb4'}")
+@Comment("子女信息管理")
+public class ChildManage extends BaseModel implements Serializable {
+
+
+    @Column
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    @Comment("guardianUserId1")
+    private String guardianUserId1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("监护人1（教工）姓名")
+    private String guardianUserName1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("工号")
+    private String guardianLoginName1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    @Comment("所在工会Id")
+    private String guardianUnionId1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("所在工会")
+    private String guardianUnionName1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("手机号码")
+    private String guardianMobile1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    @Comment("所在单位Id")
+    private String guardianUnitId1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("所在单位")
+    private String guardianUnitName1;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    @Comment("guardianUserId2")
+    private String guardianUserId2;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("监护人2（教工）姓名")
+    private String guardianUserName2;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("工号")
+    private String guardianLoginName2;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    @Comment("所在工会Id")
+    private String guardianUnionId2;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("所在工会")
+    private String guardianUnionName2;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("手机号码")
+    private String guardianMobile2;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    @Comment("所在单位Id")
+    private String guardianUnitId2;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("所在单位")
+    private String guardianUnitName2;
+
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("子女姓名")
+    private String childrenName;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("就读年级")
+    private String childrenGrade;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("入学年份")
+    private String childrenYear;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("身份证号")
+    private String childrenIdCard;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("出身年月")
+    private String childrenBirthday;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("性别")
+    private String childrenSex;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    @Comment("国籍")
+    private String childrenCountry;
+
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("现就读学校")
+    private String childrenCurrentSchool;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("中考总成绩")
+    private String childrenMiddleScore;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("学科组合")
+    private String childrenSubjectCombination;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 100)
+    @Comment("子女户籍所在地")
+    private String childrenHuKouAddress;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 200)
+    @Comment("备注")
+    private String note;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    @Comment("填写时间")
+    private String applyTime;
+
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/ChildManageService.java

@@ -0,0 +1,10 @@
+package com.budwk.app.zhgh.staffmanage.childManage.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage;
+import com.budwk.app.zhgh.staffmanage.childManage.vo.ChildManagePageForm;
+import org.nutz.dao.sql.Sql;
+
+public interface ChildManageService extends BaseService<ChildManage> {
+    Sql getSql(ChildManagePageForm pageForm);
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/impl/ChildManageServiceImpl.java

@@ -0,0 +1,62 @@
+package com.budwk.app.zhgh.staffmanage.childManage.service.impl;
+
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage;
+import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService;
+import com.budwk.app.zhgh.staffmanage.childManage.vo.ChildManagePageForm;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+
+@Slf4j
+@IocBean(args = {"refer:dao"})
+public class ChildManageServiceImpl extends BaseServiceImpl<ChildManage>  implements ChildManageService {
+
+    public ChildManageServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+    @Override
+    public Sql getSql(ChildManagePageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*
+                FROM
+                  child_manage info   
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        // 模糊查询
+        if (pageForm.getSearchName() != null && !pageForm.getSearchName().isEmpty() && pageForm.getSearchKeyword() != null && !pageForm.getSearchKeyword().isEmpty()) {
+            switch (pageForm.getSearchName()) {
+                case "info.childrenName":
+                    cnd.and("info.childrenName", "like", "%" + pageForm.getSearchKeyword() + "%");
+                    break;
+                case "info.guardianUserName":  // 合并后的监护人查询
+                    cnd.and(Cnd.exps("info.guardianUserName1", "like", "%" + pageForm.getSearchKeyword() + "%")
+                            .or("info.guardianUserName2", "like", "%" + pageForm.getSearchKeyword() + "%"));
+                    break;
+            }
+        }
+
+        // 工会筛选 (查询两个监护人的工会)
+        if (pageForm.getUnionId() != null && !pageForm.getUnionId().isEmpty()) {
+            cnd.and(Cnd.exps("info.guardianUnionId1", "=", pageForm.getUnionId())
+                    .or("info.guardianUnionId2", "=", pageForm.getUnionId()));
+        }
+        // 所属单位筛选 (查询两个监护人的单位)
+        if (pageForm.getUnitId() != null && !pageForm.getUnitId().isEmpty()) {
+            cnd.and(Cnd.exps("info.guardianUnitId1", "=", pageForm.getUnitId())
+                    .or("info.guardianUnitId2", "=", pageForm.getUnitId()));
+        }
+
+        cnd.andEX("YEAR(info.applyTime)", "=", pageForm.getYear());
+        cnd.andEX("info.childrenGrade", "=", pageForm.getChildrenGrade());
+        sql.setCondition(cnd);
+        return sql;
+    }
+}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/vo/ChildManagePageForm.java

@@ -0,0 +1,14 @@
+package com.budwk.app.zhgh.staffmanage.childManage.vo;
+import com.budwk.app.base.param.PageForm;
+import lombok.Data;
+
+@Data
+public class ChildManagePageForm extends PageForm {
+
+    private Integer year;
+    private String unionId;
+    private String unitId;
+    private String childrenGrade;
+    private String searchName;
+    private String searchKeyword;
+}

src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherChartController.java

@@ -0,0 +1,59 @@
+package com.budwk.app.zhgh.staffmanage.singleTeacher.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.service.SingleTeacherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+
+@IocBean
+@At("/platform/singleTeacher/chart")
+@Ok("json:full")
+@Api("单身教工图表")
+public class SingleTeacherChartController {
+
+    @Inject
+    private SingleTeacherService singleTeacherService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/singleTeacher/chart/index.html")
+    @SaCheckPermission("singleTeacher.chart")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.chart")
+    @ApiOperation("图表数据")
+    public Result list(String unionId, String sex) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  st.*,
+                  u.username,
+                  u.loginname,
+                  u.sex,
+                  u.unionName,
+                  u.unitName
+                FROM
+                  `single_teacher` st
+                  LEFT JOIN vw_user u ON u.id = st.userId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("u.unionId", "=", unionId);
+        cnd.andEX("u.sex", "=", sex);
+        sql.setCondition(cnd);
+        List<NutMap> list = singleTeacherService.listMap(sql);
+        return Result.success(list);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java

@@ -0,0 +1,108 @@
+package com.budwk.app.zhgh.staffmanage.singleTeacher.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.zhgh.staffmanage.singleTeacher.models.SingleTeacher;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.param.SingleTeacherPageForm;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.service.SingleTeacherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+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;
+
+import javax.servlet.http.HttpServletResponse;
+
+@IocBean
+@At("/platform/singleTeacher/ledger")
+@Ok("json:full")
+@Api("单教师台账")
+public class SingleTeacherLedgerController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private SingleTeacherService singleTeacherService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/singleTeacher/ledger/index.html")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.ledger")
+    @ApiOperation("分页查询")
+    @Ok("json:{dateFormat:'yyyy-MM-dd'}")
+    public Result pageData(@Param("pageForm") SingleTeacherPageForm pageForm) {
+        Pagination pagination = singleTeacherService.pageData(pageForm);
+        return Result.success(pagination);
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.ledger")
+    @ApiOperation("新增")
+    @SLog(tag = "单身教工台账", msg = "新增了一条记录，用户ID：${args[0].userId}")
+    public Result insert(@Param("singleTeacher") SingleTeacher singleTeacher) {
+        dao.insert(singleTeacher);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.ledger")
+    @ApiOperation("编辑")
+    @SLog(tag = "单身教工台账", msg = "编辑了一条记录，用户ID：${args[0].userId}")
+    public Result update(@Param("singleTeacher") SingleTeacher singleTeacher) {
+        dao.update(singleTeacher);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.ledger")
+    @ApiOperation("删除")
+    @SLog(tag = "单身教工台账", msg = "删除了一条记录，用户ID：${args[0].userId}")
+    public Result delete(@Param("id") String id) {
+        dao.delete(SingleTeacher.class, id);
+        return Result.success();
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.ledger")
+    @ApiOperation("详情")
+    public Result detail(@Param("id") String id) {
+        SingleTeacher singleTeacher = dao.fetch(SingleTeacher.class, id);
+        return Result.success(singleTeacher);
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.ledger")
+    @ApiOperation("查询非单身教工人员")
+    public Result queryNotSingleTeacher(@Param("key") String key) {
+        Sql sql = Sqls.create("select id,username,loginname,mobile,education,birthday from sys_user $condition");
+        Cnd cnd = Cnd.NEW();
+        cnd.and("id", "not in", Sqls.create("select userId from single_teacher"));
+        SqlExpressionGroup seg = new SqlExpressionGroup();
+        seg.orLike("username", key);
+        seg.orLike("loginname", key);
+        cnd.and(seg);
+        sql.setCondition(cnd);
+        Pagination pagination = singleTeacherService.listPageMap(1, 10, sql);
+        return Result.success(pagination.getList());
+    }
+
+    @At
+    @SaCheckPermission("singleTeacher.ledger")
+    @ApiOperation("导出Excel")
+    public void exportExcel(@Param("pageForm") SingleTeacherPageForm pageForm, HttpServletResponse response) {
+        singleTeacherService.exportExcel(pageForm, response);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/models/SingleTeacher.java

@@ -0,0 +1,110 @@
+package com.budwk.app.zhgh.staffmanage.singleTeacher.models;
+
+import cn.hutool.json.JSONObject;
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table("single_teacher")
+@TableIndexes({@Index(name = "IDX_SINGLE_TEACHER_USER_ID", fields = {"userId"}, unique = false)})
+@Comment("单身教工")
+public class SingleTeacher extends BaseModel {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    @Comment("ID")
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("用户Id")
+    private String userId;
+
+    @Column
+    @ColDefine(type = ColType.DATE)
+    @Comment("出生年月")
+    private Date birthday;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("联系方式")
+    private String mobile;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("身高")
+    private String height;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("籍贯")
+    private String nativePlace;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("学历")
+    private String education;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("兴趣爱好")
+    private String hobby;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("月收入")
+    private String monthlyIncome;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("住房情况")
+    private String housingSituation;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("上传照片")
+    private List<String> picFiles;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 100)
+    @Comment("形象照片")
+    private String photo;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("婚姻状况")
+    private String maritalStatus;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("交友意向")
+    private String intentionFriends;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("个人介绍")
+    private String introduction;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("申请时间")
+    private Date applyTime;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("加入时间")
+    private Date joinTime;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("退出时间")
+    private Date exitTime;
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java

@@ -0,0 +1,38 @@
+package com.budwk.app.zhgh.staffmanage.singleTeacher.param;
+
+import com.budwk.app.base.param.PageForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("单教师台账分页参数")
+public class SingleTeacherPageForm extends PageForm {
+
+    @ApiModelProperty("分工会ID")
+    private String unionId;
+
+    @ApiModelProperty("单位ID")
+    private String unitId;
+
+    @ApiModelProperty("性别")
+    private String sex;
+
+    @ApiModelProperty("婚姻状况")
+    private String maritalStatus;
+
+    @ApiModelProperty("学历")
+    private String education;
+
+    @ApiModelProperty("年龄范围")
+    private Integer[] age;
+
+    @ApiModelProperty("人员类型")
+    private String personType;
+
+    @ApiModelProperty("在职状态")
+    private String userState;
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/SingleTeacherService.java

@@ -0,0 +1,14 @@
+package com.budwk.app.zhgh.staffmanage.singleTeacher.service;
+
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.models.SingleTeacher;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.param.SingleTeacherPageForm;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface SingleTeacherService extends BaseService<SingleTeacher> {
+    void exportExcel(SingleTeacherPageForm pageForm, HttpServletResponse response);
+
+    Pagination pageData(SingleTeacherPageForm pageForm);
+}

src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java

@@ -0,0 +1,116 @@
+package com.budwk.app.zhgh.staffmanage.singleTeacher.service.impl;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.models.SingleTeacher;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.param.SingleTeacherPageForm;
+import com.budwk.app.zhgh.staffmanage.singleTeacher.service.SingleTeacherService;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+@IocBean(args = {"refer:dao"})
+public class SingleTeacherServiceImpl extends BaseServiceImpl<SingleTeacher> implements SingleTeacherService {
+    public SingleTeacherServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+    @Override
+    public void exportExcel(SingleTeacherPageForm pageForm, HttpServletResponse response) {
+        Sql sql = buildSql(pageForm);
+        List<NutMap> list = listMap(sql);
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).put("序号", (i + 1));
+        }
+
+        List<ExcelExportEntity> entities = new ArrayList<>();
+        entities.add(new ExcelExportEntity("序号", "index", 20));
+        entities.add(new ExcelExportEntity("姓名", "username", 20));
+        entities.add(new ExcelExportEntity("工号", "loginname", 20));
+        entities.add(new ExcelExportEntity("性别", "sex", 20));
+        entities.add(new ExcelExportEntity("手机号码", "mobile", 20));
+        entities.add(new ExcelExportEntity("出生日期", "birthday", 20));
+        entities.add(new ExcelExportEntity("学历", "education", 20));
+        entities.add(new ExcelExportEntity("婚姻状况", "maritalStatus", 20));
+        entities.add(new ExcelExportEntity("单位名称", "unitName", 20));
+        entities.add(new ExcelExportEntity("工会名称", "unionName", 20));
+        entities.add(new ExcelExportEntity("介绍", "introduction", 20));
+
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.XSSF);
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, list);
+        CommonDownloadUtil.download("单身教工人员名单.xlsx", workbook, response);
+    }
+
+    @Override
+    public Pagination pageData(SingleTeacherPageForm pageForm) {
+        Sql sql = buildSql(pageForm);
+        return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+    }
+
+    /**
+     * 构建查询条件
+     *
+     * @param pageForm
+     * @return
+     */
+    private Sql buildSql(SingleTeacherPageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  st.*,
+                  u.username,
+                  u.loginname,
+                  u.sex,
+                  u.unionName,
+                  u.unitName,
+                  u.personType,
+                  u.userState
+                FROM
+                  `single_teacher` st
+                  LEFT JOIN vw_user u ON u.id = st.userId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or("u.username", "like", "%" + pageForm.getSearchKeyword() + "%");
+            seg.or("u.loginname", "like", "%" + pageForm.getSearchKeyword() + "%");
+            cnd.and(seg);
+        }
+        cnd.where().andBetween("TIMESTAMPDIFF(YEAR, u.birthday, CURDATE())", pageForm.getAge()[0], pageForm.getAge()[1]);
+        cnd.andEX("u.unionId", "=", pageForm.getUnionId());
+        cnd.andEX("u.sex", "=", pageForm.getSex());
+        cnd.andEX("u.unitId", "=", pageForm.getUnitId());
+        cnd.andEX("u.personType", "=", pageForm.getPersonType());
+        cnd.andEX("u.userState", "=", pageForm.getUserState());
+        cnd.andEX("st.education", "=", pageForm.getEducation());
+        cnd.andEX("u.maritalStatus", "=", pageForm.getMaritalStatus());
+
+        if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        } else {
+            cnd.asc("u.unionCode");
+        }
+
+        sql.setCondition(cnd);
+        return sql;
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java

@@ -0,0 +1,236 @@
+package com.budwk.app.zhgh.staffmanage.thirtyTeach.controller;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.excel.EasyExcel;
+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.CommonDownloadUtil;
+import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.zhgh.staffmanage.thirtyTeach.param.ThirtyTeachPageForm;
+import com.budwk.app.zhgh.staffmanage.thirtyTeach.service.ThirtyTeachService;
+import com.budwk.app.zhgh.staffmanage.thirtyTeach.template.ThirtyTeachTemp;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+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.lang.Lang;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.AdaptBy;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+import org.nutz.mvc.upload.TempFile;
+import org.nutz.mvc.upload.UploadAdaptor;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhf
+ * @date 2025/7/25 18:27
+ * @description 教职工管理
+ */
+@IocBean
+@Ok("json:full")
+@Slf4j
+@Api(tags = "三十龄教工-教职工管理")
+@At("/platform/thirtyTeach/manage")
+public class ThirtyTeachController {
+
+
+    @Inject
+    private ThirtyTeachService thirtyTeachService;
+    @Inject
+    private SysUserService sysUserService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/thirtyTeach/manage/index.html")
+    @SaCheckPermission("thirtyTeach.manage")
+    public void index() {
+    }
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("thirtyTeach.manage")
+    public Result pageData(ThirtyTeachPageForm pageForm) {
+        Sql sql = thirtyTeachService.getSql(pageForm);
+        Pagination pagination = thirtyTeachService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @ApiOperation("一键设置三十龄教工")
+    @SaCheckPermission("thirtyTeach.manage")
+    @SLog(type = "30龄教工-教职工管理", tag = "设置三十龄教工",msg = "设置三十龄教工设置教龄${args[0]}")
+    public Result setThirtyTeach(Integer setNum, boolean isFlag){
+        if (isFlag) {
+            sysUserService.update(Chain.make("isThirtyTeach", 0), Cnd.NEW());
+        }
+        Cnd cnd = Cnd.NEW();
+        cnd.and("arrivalAtSchoolDate", "is not", null);
+        cnd.and("arrivalAtSchoolDate", "!=", "");
+        cnd.and("TIMESTAMPDIFF(YEAR, CONCAT(arrivalAtSchoolDate, '-01'), CURDATE())", ">", setNum);
+        sysUserService.update(Chain.make("isThirtyTeach", 1), cnd);
+        return Result.success();
+    }
+
+    @At
+    @ApiOperation("批量删除三十龄教工")
+    @SaCheckPermission("thirtyTeach.manage")
+    @SLog(type = "30龄教工-教职工管理", tag = "批量删除三十龄教工",msg = "批量删除三十龄教工${args[0]}")
+    public Result doBatchDelete(@Param("userIds") String[] userIds) {
+        List<String> userIdList = Arrays.asList(userIds);
+        if (Lang.isNotEmpty(userIdList)) {
+            sysUserService.update(Chain.make("isThirtyTeach", 0), Cnd.where("id", "in", userIdList));
+        }
+        return Result.success();
+    }
+
+
+    @At
+    @SaCheckPermission("thirtyTeach.manage")
+    @Ok("void")
+    @ApiOperation("导出30教龄教职工名单")
+    public void doExport(ThirtyTeachPageForm pageForm, HttpServletResponse response){
+
+        Sql sql = thirtyTeachService.getSql(pageForm);
+        List<NutMap> list = thirtyTeachService.listMap(sql);
+        List<ExcelExportEntity> entityList = new ArrayList<>();
+        ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10);
+        no.setFormat("isAddIndex");
+        entityList.add(no);
+        entityList.add(new ExcelExportEntity("工号", "loginname", 20));
+        entityList.add(new ExcelExportEntity("姓名", "username", 20));
+        entityList.add(new ExcelExportEntity("性别", "sex", 20));
+        entityList.add(new ExcelExportEntity("教龄(年)", "teachNum", 20));
+        entityList.add(new ExcelExportEntity("电话", "mobile", 20));
+        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("荣誉证办理年月", "thirtyCertificateProcessingTime", 20));
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.XSSF);
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, list);
+        CommonDownloadUtil.download("30教龄教职工名单.xlsx", workbook, response);
+    }
+
+    @At
+    @Ok("void")
+    @ApiOperation("下载导入30教龄教职工模版")
+    @SaCheckPermission("thirtyTeach.manage")
+    public void downloadImportTemp(HttpServletResponse response) {
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            EasyExcel.write(byteArrayOutputStream, ThirtyTeachTemp.class)
+                    .sheet("30教龄教职工模版")
+                    .doWrite(ArrayList::new);
+            CommonDownloadUtil.download("30教龄教职工模版.xlsx", byteArrayOutputStream.toByteArray(), response);
+        } catch (Exception e) {
+            log.error("下载导入模版失败", e);
+        }
+
+    }
+
+
+    @At
+    @ApiOperation("修改荣誉证办理年月")
+    @SaCheckPermission("thirtyTeach.manage")
+    public Result doEditThirtyCertificateProcessingTime(String id,String thirtyCertificateProcessingTime){
+        sysUserService.update(Chain.make("thirtyCertificateProcessingTime", thirtyCertificateProcessingTime), Cnd.where("id", "=", id));
+        return Result.success();
+    }
+
+
+
+    @At
+    @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission("thirtyTeach.manage")
+    @ApiOperation("导入30教龄教职工名单")
+    @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
+    public Result doImport(TempFile file, Boolean isFlag) {
+        try {
+            List<T> ts = EasyExcelUtil.syncReadModel(file.getFile(), ThirtyTeachTemp.class, 0, 1);
+            List<ThirtyTeachTemp> teachTempList = JSONUtil.parseArray(JSONUtil.toJsonStr(ts)).toList(ThirtyTeachTemp.class);
+
+            List<Sys_user> users = sysUserService.query();
+
+            List<ThirtyTeachTemp> errorInfos = new ArrayList<>();
+            List<Sys_user> insertUserList = new ArrayList<>();
+
+            for (ThirtyTeachTemp temp : teachTempList) {
+                if (StrUtil.isBlank(temp.getUserName())) {
+                    temp.setResult("获取不到该用户的姓名！");
+                    errorInfos.add(temp);
+                    break;
+                } else if (StrUtil.isBlank(temp.getLoginName())) {
+                    temp.setResult("获取不到该用户的出生日期！");
+                    errorInfos.add(temp);
+                    break;
+                }else if (StrUtil.isBlank(temp.getThirtyCertificateProcessingTime())) {
+                    temp.setResult("获取不到该用户的荣誉证办理时间！");
+                    errorInfos.add(temp);
+                    break;
+                }
+
+                List<Sys_user> matchUsers = users.stream().filter(u -> u.getLoginname().equals(temp.getLoginName())).map(u -> {
+                    Sys_user user = new Sys_user();
+                    user.setId(u.getId());
+                    user.setLoginname(temp.getLoginName());
+                    user.setIsThirtyTeach(true);
+                    user.setThirtyCertificateProcessingTime(temp.getThirtyCertificateProcessingTime());
+                    return user;
+                }).collect(Collectors.toList());
+                insertUserList.addAll(matchUsers);
+
+            }
+
+            int i = 0;
+            if (Lang.isNotEmpty(insertUserList)) {
+                if (isFlag) {
+                    sysUserService.update(Chain.make("isThirtyTeach", 0), Cnd.NEW());
+                }
+                i = sysUserService.updateIgnoreNull(insertUserList);
+            }
+            if (Lang.isNotEmpty(errorInfos)) {
+                NutMap nutMap = new NutMap();
+                nutMap.setv("totalCount", teachTempList.size());
+                nutMap.setv("successCount", i);
+                nutMap.setv("errorCount", errorInfos.size());
+                nutMap.setv("errorList", errorInfos.stream().map(v -> {
+                    return NutMap.NEW().addv("工号", v.getLoginName()).addv("姓名", v.getUserName()).addv("错误原因", v.getResult());
+                }).collect(Collectors.toList()));
+                return Result.success(nutMap);
+            }
+            return Result.success();
+
+        }catch (Exception e){
+            log.error("导入30教龄教职工名单失败", e);
+            e.printStackTrace();
+            return Result.error();
+        }
+    }
+
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachSummaryController.java

@@ -0,0 +1,126 @@
+package com.budwk.app.zhgh.staffmanage.thirtyTeach.controller;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+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.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2025/7/25 18:28
+ * @description 教职工汇总
+ */
+@IocBean
+@Ok("json:full")
+@Slf4j
+@Api(tags = "三十龄教工-教职工汇总")
+@At("/platform/thirtyTeach/summary")
+public class ThirtyTeachSummaryController {
+
+    @Inject
+    private SysUserService sysUserService;
+
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/thirtyTeach/summary/index.html")
+    @SaCheckPermission("thirtyTeach.summary")
+    public void index() {
+    }
+
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("thirtyTeach.summary")
+    public Result pageData(String unionId,String unitId){
+        Sql sql = Sqls.create("""
+                SELECT
+                	su.*,
+                	COUNT( u.id ) AS userNum
+                FROM
+                	sys_union su
+                	LEFT JOIN `vw_user` u ON u.unionid = su.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("u.isThirtyTeach", "=", 1);
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
+        }
+        cnd.andEX("u.unionId", "=", unionId);
+        cnd.andEX("u.unitId", "=", unitId);
+        cnd.groupBy("su.unionCode");
+        cnd.asc("su.unionCode");
+        sql.setCondition(cnd);
+        return Result.success(sysUserService.listMap(sql));
+
+    }
+
+    @At
+    @SaCheckPermission("thirtyTeach.summary")
+    @Ok("void")
+    @ApiOperation("导出工会汇总名单")
+    public void doExportSummary(String unionId,String unitId, HttpServletResponse response){
+
+        Sql sql = Sqls.create("""
+                SELECT
+                	su.*,
+                	COUNT( u.id ) AS userNum
+                FROM
+                	sys_union su
+                	LEFT JOIN `vw_user` u ON u.unionid = su.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("u.isThirtyTeach", "=", 1);
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
+        }
+        cnd.andEX("u.unionId", "=", unionId);
+        cnd.andEX("u.unitId", "=", unitId);
+        cnd.groupBy("su.unionCode");
+        cnd.asc("su.unionCode");
+        sql.setCondition(cnd);
+        List<NutMap> thirtyTeachList = sysUserService.listMap(sql);
+
+        List<ExcelExportEntity> entityList = new ArrayList<>();
+        ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10);
+        no.setFormat("isAddIndex");
+        entityList.add(no);
+        entityList.add(new ExcelExportEntity("分工会", "name", 20));
+        ExcelExportEntity entity = new ExcelExportEntity("在职人数", "userNum", 20);
+        entity.setType(10);
+        entityList.add(entity);
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.XSSF);
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, thirtyTeachList);
+        CommonDownloadUtil.download("30教龄教职工在职人员汇总表.xlsx", workbook, response);
+
+    }
+
+
+
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/param/ThirtyTeachPageForm.java

@@ -0,0 +1,23 @@
+package com.budwk.app.zhgh.staffmanage.thirtyTeach.param;
+
+import com.budwk.app.base.param.PageForm;
+import lombok.Data;
+
+/**
+ * @author zhf
+ * @date 2025/7/28 10:09
+ * @description 30龄教工
+ */
+@Data
+public class ThirtyTeachPageForm extends PageForm {
+
+    private String unionId;
+    private String unitId;
+    //进校时长
+    private String teachNum;
+    //办证年月
+    private String thirtyCertificateProcessingTime;
+    private String userState;
+    private String personType;
+
+}

src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/ThirtyTeachService.java

@@ -0,0 +1,15 @@
+package com.budwk.app.zhgh.staffmanage.thirtyTeach.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.staffmanage.thirtyTeach.param.ThirtyTeachPageForm;
+import org.nutz.dao.sql.Sql;
+
+/**
+ * @author zhf
+ * @date 2025/7/28 11:52
+ * @description
+ */
+public interface ThirtyTeachService extends BaseService {
+
+    Sql getSql(ThirtyTeachPageForm pageForm);
+}

src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java

@@ -0,0 +1,78 @@
+package com.budwk.app.zhgh.staffmanage.thirtyTeach.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffmanage.thirtyTeach.param.ThirtyTeachPageForm;
+import com.budwk.app.zhgh.staffmanage.thirtyTeach.service.ThirtyTeachService;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @author zhf
+ * @date 2025/7/28 11:53
+ * @description
+ */
+@IocBean(args = {"refer:dao"})
+public class ThirtyTeachServiceImpl extends BaseServiceImpl implements ThirtyTeachService {
+    public ThirtyTeachServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+    @Override
+    public Sql getSql(ThirtyTeachPageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  id,
+                  loginname,
+                  username,
+                  sex,
+                  member,
+                  personType,
+                  userState,
+                  unionName,
+                  unitName,
+                  mobile,
+                  birthday,
+                  thirtyCertificateProcessingTime,
+                  false as isEditThirtyCertificateProcessingTime,
+                  TIMESTAMPDIFF(YEAR, CONCAT(arrivalAtSchoolDate, '-01'), CURDATE()) AS teachNum
+                FROM
+                  `vw_user`
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("isThirtyTeach", "=", 1);
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("loginname", pageForm.getSearchKeyword());
+            seg.orLike("username", pageForm.getSearchKeyword());
+            cnd.and(seg);
+        }
+
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+            cnd.and("unionId", "=", SecurityUtil.getUnionId());
+        }
+        cnd.andEX("TIMESTAMPDIFF(YEAR, CONCAT(arrivalAtSchoolDate, '-01'), CURDATE())", "=", pageForm.getTeachNum());
+        cnd.andEX("unionId", "=", pageForm.getUnionId());
+        cnd.andEX("unitId", "=", pageForm.getUnitId());
+        cnd.andEX("personType", "=", pageForm.getPersonType());
+        cnd.andEX("userState", "=", pageForm.getUserState());
+        cnd.and(Cnd.likeEX("thirtyCertificateProcessingTime",pageForm.getThirtyCertificateProcessingTime()));
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.asc("unionCode").asc("unitCode");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+
+        sql.setCondition(cnd);
+        return sql;
+    }
+}

src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/template/ThirtyTeachTemp.java

@@ -0,0 +1,31 @@
+package com.budwk.app.zhgh.staffmanage.thirtyTeach.template;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@Data
+@EqualsAndHashCode
+@ContentRowHeight(20) // 内容行高
+@HeadRowHeight(20)   // 表头行高
+@ColumnWidth(25)
+public class ThirtyTeachTemp  {
+
+    @ExcelProperty("工号")
+    private String loginName;
+
+    @ExcelProperty("姓名")
+    private String userName;
+
+    @ExcelProperty("《30年教龄荣誉证》办理年月")
+    private String thirtyCertificateProcessingTime;
+
+    @ExcelIgnore
+    private String result;
+
+}