Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

2025-11-17 08:59:19 +08:00
parent b7996979a2 e7d3670c5a
commit 586764e0be
36 changed files with 573 additions and 126 deletions
@@ -1,4 +1,4 @@
-package com.budwk.app.base.utils;
+package com.budwk.app.base.utils.easyexcel;

 import com.alibaba.excel.EasyExcelFactory;
 import org.apache.poi.ss.formula.functions.T;
@@ -0,0 +1,63 @@
+package com.budwk.app.base.utils.easyexcel;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.lang.util.NutMap;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：NoModelDataListener
+ * @Date 2025/11/8 15:22
+ * @注释 没有定义的数据对象的读取
+ */
+@Slf4j
+public class NoModelDataListener implements ReadListener<Map<Integer, String>> {
+
+    private boolean firstRow = true;
+    // 表头数据
+    @Getter
+    private List<String> headers = new ArrayList<>();
+    // 表内容数据
+    @Getter
+    private List<NutMap> dataList = new ArrayList<>();
+
+    @Override
+    public void invoke(Map<Integer, String> rowMap, AnalysisContext context) {
+        if (firstRow) {
+            // 第一行是表头：按列索引存 header
+            headers = new ArrayList<>(Collections.nCopies(rowMap.size(), ""));
+            for (Map.Entry<Integer, String> entry : rowMap.entrySet()) {
+                headers.set(entry.getKey(), entry.getValue());
+            }
+            firstRow = false;
+        } else {
+            // 后续行是数据：用 header 作为 key
+            NutMap nutMap = new NutMap();
+            for (Map.Entry<Integer, String> entry : rowMap.entrySet()) {
+                Integer colIndex = entry.getKey();
+                String value = entry.getValue();
+                String header = colIndex < headers.size() ? headers.get(colIndex) : "Column" + colIndex;
+                nutMap.put(header, value);
+            }
+            dataList.add(nutMap);
+        }
+    }
+
+    public List<NutMap> getDataList() {
+        return dataList;
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        log.info("共读取 {} 行数据（不含表头）", dataList.size());
+    }
+
+}
@@ -16,7 +16,7 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.base.utils.CommonDownloadUtil;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.models.Sys_role;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
@@ -16,7 +16,7 @@ import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.base.utils.CommonDownloadUtil;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
 import com.budwk.app.zhgh.activity.basic.template.UserTemp;
@@ -5,7 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.zhgh.benefit.mode.BenefitUserTemp;
 import com.budwk.app.zhgh.benefit.models.BenefitUser;
@@ -9,9 +9,8 @@ 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.base.utils.CommonDownloadUtil;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.models.Sys_role;
-import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.sys.models.Sys_user_role;
 import com.budwk.app.sys.services.SysRoleService;
 import com.budwk.app.sys.services.SysUserService;
@@ -30,7 +29,6 @@ import com.budwk.app.zhgh.club.service.SysClubUserService;
 import com.budwk.app.zhgh.club.vo.ClubCommonPageVo;
 import com.budwk.app.zhgh.club.vo.ClubUserImportVo;
 import io.swagger.annotations.ApiOperation;
-import org.apache.axis.utils.IDKey;
 import org.apache.poi.ss.formula.functions.T;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Chain;
@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.base.utils.ManyAddOrRenewUtil;
 import com.budwk.app.sys.models.Sys_user;
 import com.budwk.app.zhgh.dayofficework.exerciseCard.model.ExerciseCard;
@@ -14,7 +14,7 @@ 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.base.utils.CommonDownloadUtil;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 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;
@@ -15,7 +15,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.budwk.app.base.param.PageForm;
 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.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.models.Sys_union;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail;
@@ -15,9 +15,8 @@ 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.base.utils.CommonDownloadUtil;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.views.View_user;
-import com.budwk.app.zhgh.dayofficework.healthCheckup.template.HealthCheckupImportTemp;
 import com.budwk.app.zhgh.dayofficework.retiresouvenirs.model.RetireSouvenirsBatch;
 import com.budwk.app.zhgh.dayofficework.retiresouvenirs.model.RetireSouvenirsLedger;
 import com.budwk.app.zhgh.dayofficework.retiresouvenirs.service.RetireSouvenirsBatchService;
@@ -4,11 +4,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
-import com.budwk.app.base.utils.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.base.utils.ManyAddOrRenewUtil;
 import com.budwk.app.sys.models.Sys_user;
-import com.budwk.app.zhgh.dayofficework.exerciseCard.model.ExerciseCard;
-import com.budwk.app.zhgh.dayofficework.exerciseCard.vo.ExercisePeopleImportVo;
 import com.budwk.app.zhgh.dayofficework.womanSanitary.model.WomanSanitaryUser;
 import com.budwk.app.zhgh.dayofficework.womanSanitary.service.WomanSanitaryUserService;
 import com.budwk.app.zhgh.dayofficework.womanSanitary.vo.WomanSanitaryUserImportVo;
@@ -9,7 +9,7 @@ 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.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.models.Sys_union;
 import com.budwk.app.sys.services.SysDictService;
 import com.budwk.app.zhgh.benefit.mode.BenefitUserTemp;
@@ -11,6 +11,7 @@ import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.*;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.models.Sys_role;
 import com.budwk.app.sys.models.Sys_unit;
 import com.budwk.app.sys.models.Sys_user_role;
@@ -1,5 +1,12 @@
 package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
 /**
 * @version 1.0
 * @Author FKY
@@ -7,5 +14,16 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
 * @Date 2025/10/15 10:48
 * @注释
 */
+@Slf4j
+@IocBean
+@Api("分工会审核核对")
+@Ok("json:full")
+@At("/platform/personnel/check/verification/branch")
 public class CheckTaskBranchAuditController {
+
+    @At("/")
+    @SaCheckPermission("personnel.check.verification.branch")
+    @Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/branch/index.html")
+    public void index() {
+    }
 }
@@ -1,6 +1,11 @@
 package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;

 /**
 * @version 1.0
@@ -9,6 +14,16 @@ import org.nutz.ioc.loader.annotation.IocBean;
 * @Date 2025/10/17 16:46
 * @注释
 */
+@Slf4j
@IocBean
+@Api("工会小组审核核对")
+@Ok("json:full")
+@At("/platform/personnel/check/verification/group")
 public class CheckTaskGroupAuditController {
+
+    @At("/")
+    @SaCheckPermission("personnel.check.verification.group")
+    @Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/group/index.html")
+    public void index() {
+    }
 }
@@ -1,5 +1,12 @@
 package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
 /**
 * @version 1.0
 * @Author FKY
@@ -7,5 +14,16 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
 * @Date 2025/10/15 10:48
 * @注释
 */
+@Slf4j
+@IocBean
+@Api("校工会审核核对")
+@Ok("json:full")
+@At("/platform/personnel/check/verification/school")
 public class CheckTaskSchoolAuditController {
+
+    @At("/")
+    @SaCheckPermission("personnel.check.verification.school")
+    @Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/school/index.html")
+    public void index() {
+    }
 }
@@ -1,16 +1,26 @@
 package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskBusinessConfig;
 import com.budwk.app.zhgh.staffmanage.personnelcheck.service.CheckTaskCommonService;
+import com.budwk.app.zhgh.staffmanage.personnelcheck.vo.pageform.CheckTaskCommonPageForm;
 import io.swagger.annotations.Api;
 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.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.validation.Valid;
+import java.util.List;
+
 /**
 * @version 1.0
 * @Author FKY
@@ -39,7 +49,57 @@ public class CheckTaskSingleController {

    @At
    @SaCheckPermission("personnel.check.verification.single")
-    public Result getSingleCheckTask(){
+    public Result pageData(CheckTaskCommonPageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    u.id AS userId,
+                	u.sex,
+                	u.loginname,
+                	u.username,
+                	u.mobile,
+                	u.unitId,
+                	u.unitName,
+                	u.unionId,
+                	u.unionName,
+                	u.birthday,
+                	u.manyUnit,
+                	u.member,
+                	u.userState,
+                	u.preparedBy,
+                	u.personType,
+                    person.id,
+                    person.currentStep
+                FROM
+                    check_task_personnel person
+                    LEFT JOIN `user` u ON u.loginname = person.loginname
+                $condition
+                """);
+        CheckTaskBusinessConfig config = dao.fetch(CheckTaskBusinessConfig.class, Cnd.where(CheckTaskBusinessConfig::getCode, "=", pageForm.getTaskCode()));
+        List<NutMap> list = config.getWorkflowSteps();
+
+        // 找出第一个步骤
+        String stepCode = list.get(0).getString("stepCode");
+
+        Cnd cnd = Cnd.NEW();
+        pageForm.buildSearch(cnd, "u.");
+
+
+        sql.setCondition(cnd);
+        Pagination pagination = checkTaskCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+
+    @At
+    @SaCheckPermission("personnel.check.verification.single")
+    public Result doSave() {
+        return Result.success();
+    }
+
+
+    @At
+    @SaCheckPermission("personnel.check.verification.single")
+    public Result findOne(@Valid String id){
        return Result.success();
    }
 }
@@ -9,6 +9,7 @@ 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.flow.engine.FlowEngine;
+import com.budwk.app.sys.services.SysFileService;
 import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskBusinessConfig;
 import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskFiledConfig;
 import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskVerification;
@@ -26,6 +27,7 @@ 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.random.R;
 import org.nutz.mvc.annotation.AdaptBy;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
@@ -33,6 +35,8 @@ import org.nutz.mvc.annotation.Param;
 import org.nutz.mvc.upload.TempFile;
 import org.nutz.mvc.upload.UploadAdaptor;

+import java.util.List;
+
 /**
 * @version 1.0
 * @Author FKY
@@ -52,6 +56,8 @@ public class CheckTaskVerificationController {
    @Inject
    private FlowEngine flowEngine;
    @Inject
+    private SysFileService sysFileService;
+    @Inject
    private CheckTaskCommonService checkTaskCommonService;


@@ -65,10 +71,12 @@ public class CheckTaskVerificationController {
    @At
    @SaCheckPermission("personnel.check.verification.manage")
    public Result pageData(CheckTaskManagePageForm pageForm){
-        Sql sql = Sqls.create("SELECT * FROM check_task $condition");
+        Sql sql = Sqls.create("SELECT * FROM check_task_verification $condition");
        Cnd cnd = Cnd.NEW();
        cnd.andEX("YEAR(createTime)", "=", pageForm.getYear());
-        cnd.andEX("taskName", "like", "%" + pageForm.getSearchKeyword() + "%");
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and("taskName", "like", "%" + pageForm.getSearchKeyword() + "%");
+        }
        sql.setCondition(cnd);
        Pagination pagination = checkTaskCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
        return Result.success(pagination);
@@ -95,20 +103,38 @@ public class CheckTaskVerificationController {
        // 1.界面可能会对相关审核步骤做修改，修改审核流程配置
        dao.update(vo.getBusinessConfig());

-        // 2.新增或者修改事项任务
+        // 2.保存文件
+        String filePath = sysFileService.uploadReturnUrl("MINIO", file);
+
+        // 3.新增或者修改事项任务
        CheckTaskVerification verification = new CheckTaskVerification();
        verification.setId(vo.getId());
+        verification.setYear(DateUtil.thisYear());
+        verification.setTitle(vo.getTitle());
+        verification.setBusinessType(vo.getBusinessType());
+        // 存储文件名及文件路径
+        verification.setFileName(file.getSubmittedFileName());
+        verification.setFilePath(filePath);
+        verification.setStartTime(vo.getStartTime());
+        verification.setEndTime(vo.getEndTime());
+        verification.setStatus("进行中");
        verification.setCreateTime(vo.getCreateTime() == null ? DateUtil.date() : vo.getCreateTime());
        verification.setYear(DateUtil.year(verification.getCreateTime()));
        dao.insertOrUpdate(verification);

-        // 3.往字段表里面插入数据，最好做下字段映射，把相关字段与数据库的字段对应
+        // 4.往字段表里面插入数据，最好做下字段映射，把相关字段与数据库的字段对应（忽略，前端做好了字段对应）
        // todo 字段映射
+        List<CheckTaskFiledConfig> fieldConfig = vo.getFieldConfig();
+        fieldConfig.forEach(v -> {
+            v.setId(R.UU32());
+            v.setTaskId(verification.getId());
+        });
+        dao.insert(fieldConfig);

-
-        // 4.读取文件，构造数据（动态字段 data），往 CheckTaskPersonnel 表中插入数据
+        // 5.读取文件，构造数据（动态字段 data），往 CheckTaskPersonnel 表中插入数据
        // todo 读取文件 转换成数据 同时还要把字段转化成数据库的字段来存储
-
+        List<CheckTaskPersonnel> personnelData = checkTaskCommonService.readFile(fieldConfig, file);
+        dao.fastInsert(personnelData);

        return Result.success();
    }
@@ -119,9 +145,9 @@ public class CheckTaskVerificationController {
    @SaCheckPermission("personnel.check.verification.manage")
    @SLog(tag = "核对任务", msg = "删除核对任务ID:${args[0]}")
    public Result onDelete(String id){
-        dao.clear(CheckTaskVerification.class, Cnd.where("id", "=", id));
-        dao.clear(CheckTaskPersonnel.class, Cnd.where("taskId", "=", id));
-        flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+        dao.clear(CheckTaskVerification.class, Cnd.where(CheckTaskVerification::getId, "=", id));
+        dao.clear(CheckTaskPersonnel.class, Cnd.where(CheckTaskPersonnel::getTaskId, "=", id));
+        dao.clear(CheckTaskFiledConfig.class, Cnd.where(CheckTaskFiledConfig::getTaskId, "=", id));
        return Result.success();
    }

@@ -51,11 +51,6 @@ public class CheckTaskFiledConfig extends BaseModel {
    @ColDefine(type = ColType.BOOLEAN)
    private Boolean isRequired;

-    @Column
-    @Comment("是否在核对界面显示")
-    @ColDefine(type = ColType.BOOLEAN)
-    private Boolean isVisible;
-
    @Column
    @Comment("排序")
    @ColDefine(type = ColType.INT)
@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.nutz.dao.entity.annotation.*;
 import org.nutz.dao.interceptor.annotation.PrevInsert;
+import org.nutz.lang.util.NutMap;

 import java.util.List;

@@ -53,12 +54,7 @@ public class CheckTaskPersonnel extends BaseModel {
    @Column
    @Comment("动态扩展字段（用户表其余列）")
    @ColDefine(type = ColType.MYSQL_JSON)
-    private List<String> data;
-
-    @Column
-    @Comment("审核意见")
-    @ColDefine(type = ColType.VARCHAR, width = 255)
-    private String remark;
+    private NutMap data;

    @Column
    @Default("0")
@@ -72,7 +68,7 @@ public class CheckTaskPersonnel extends BaseModel {
    private String checkUserId;

    @Column
-    @Comment("核对人Id")
+    @Comment("核对人工号")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String checkLoginname;

@@ -85,4 +81,11 @@ public class CheckTaskPersonnel extends BaseModel {
    @Comment("变更信息")
    @ColDefine(type = ColType.MYSQL_JSON)
    private String changeInfos;
+
+
+    @Column
+    @Comment("审核意见")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String remark;
+
 }
@@ -52,6 +52,11 @@ public class CheckTaskVerification extends BaseModel {
    @ColDefine(type = ColType.VARCHAR, width = 255)
    private String fileName;

+    @Column
+    @Comment("文件路径")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String filePath;
+
    @Column
    @Comment("开始时间")
    @ColDefine(type = ColType.DATETIME)
@@ -1,7 +1,11 @@
 package com.budwk.app.zhgh.staffmanage.personnelcheck.service;

 import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskFiledConfig;
 import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskPersonnel;
+import org.nutz.mvc.upload.TempFile;
+
+import java.util.List;

 /**
 * @version 1.0
@@ -11,4 +15,14 @@ import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskPersonnel;
 * @注释
 */
 public interface CheckTaskCommonService extends BaseService<CheckTaskPersonnel> {
+
+    /**
+     * 读取文件
+     * @param file 文件
+     * @return
+     */
+    List<CheckTaskPersonnel> readFile(List<CheckTaskFiledConfig> fieldConfig, TempFile file);
+
+
+
 }
@@ -1,10 +1,23 @@
 package com.budwk.app.zhgh.staffmanage.personnelcheck.service.impl;

+import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.TypeReference;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
+import com.budwk.app.base.utils.easyexcel.NoModelDataListener;
+import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskFiledConfig;
 import com.budwk.app.zhgh.staffmanage.personnelcheck.model.CheckTaskPersonnel;
 import com.budwk.app.zhgh.staffmanage.personnelcheck.service.CheckTaskCommonService;
+import org.apache.poi.ss.formula.functions.T;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.random.R;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.upload.TempFile;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;

 /**
 * @version 1.0
@@ -18,4 +31,75 @@ public class CheckTaskCommonServiceImpl extends BaseServiceImpl<CheckTaskPersonn
    public CheckTaskCommonServiceImpl(Dao dao) {
        super(dao);
    }
+
+
+    @Override
+    public List<CheckTaskPersonnel> readFile(List<CheckTaskFiledConfig> fieldConfig, TempFile file) {
+        try {
+            NoModelDataListener listener = new NoModelDataListener();
+
+            EasyExcel.read(file.getInputStream(), listener)
+                    .sheet()
+                    .headRowNumber(0)
+                    .doRead();
+
+            // 表格数据列
+            List<NutMap> dataList = listener.getDataList();
+
+            // 处理fieldConfig中存储的字段名称和字段代码
+            List<NutMap> result = convertExcelHeadersToFieldCodes(dataList, fieldConfig);
+
+            // 上面取到的result，需要转换成CheckTaskPersonnel插入数据库
+            List<CheckTaskPersonnel> personnelList = result.stream().map(item -> {
+                CheckTaskPersonnel personnel = new CheckTaskPersonnel();
+                personnel.setId(R.UU32());
+                // 工号是必须的，所以不能为空
+                personnel.setLoginname(item.getString("loginname"));
+                personnel.setTaskId(fieldConfig.get(0).getTaskId());
+                personnel.setData(item);
+                // 设置默认的当前步骤
+                personnel.setCurrentStep("待核对");
+                return personnel;
+            }).toList();
+
+            return personnelList;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+
+    /**
+     * 将 Excel 表头转换为字段代码
+     *
+     * @param excelData       Excel 表数据
+     * @param fieldConfigs    字段配置列表
+     * @return 转换后的数据
+     */
+    public static List<NutMap> convertExcelHeadersToFieldCodes(
+            List<NutMap> excelData,
+            List<CheckTaskFiledConfig> fieldConfigs) {
+
+        Map<String, String> headerToCode = fieldConfigs.stream()
+                .collect(Collectors.toMap(
+                        CheckTaskFiledConfig::getFieldName,
+                        CheckTaskFiledConfig::getFieldCode,
+                        (a, b) -> a // 保留第一个
+                ));
+
+        return excelData.stream().map(original -> {
+            NutMap converted = new NutMap();
+            original.forEach((header, value) -> {
+                String code = headerToCode.get(header);
+                if (code != null) {
+                    converted.put(code, value);
+                }
+                // 否则忽略或保留，按需
+            });
+            return converted;
+        }).collect(Collectors.toList());
+    }
+
 }
@@ -0,0 +1,64 @@
+package com.budwk.app.zhgh.staffmanage.personnelcheck.vo.pageform;
+
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.param.PageForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：CheckTaskCommonPageForm
+ * @Date 2025/11/11 10:21
+ * @注释
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CheckTaskCommonPageForm extends PageForm {
+
+    @ApiModelProperty("事项id")
+    private String taskId;
+
+    @ApiModelProperty("事项CODE")
+    private String taskCode;
+
+    @ApiModelProperty("工会id")
+    private String unionId;
+
+    @ApiModelProperty("单位id")
+    private String unitId;
+
+    @ApiModelProperty("在职状态")
+    private List<String> userStates;
+
+    @ApiModelProperty("编制类别")
+    private List<String> preparedBys;
+
+    @ApiModelProperty("教职工类别")
+    private List<String> personTypes;
+
+
+    public void buildSearch(Cnd cnd, String prefix){
+        if (cnd == null) {
+            cnd = Cnd.NEW();
+        }
+
+        if (StrUtil.isNotBlank(this.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike(prefix + "username", this.getSearchKeyword());
+            seg.orLike(prefix + "loginname", this.getSearchKeyword());
+            cnd.and(seg);
+        }
+
+        cnd.andEX(prefix + "unionId", "=", this.getUnionId());
+        cnd.andEX(prefix + "unitId", "=", this.getUnitId());
+        cnd.andEX(prefix + "userState", "in", this.getUserStates());
+        cnd.andEX(prefix + "preparedBy", "in", this.getPreparedBys());
+        cnd.andEX(prefix + "personType", "in", this.getPersonTypes());
+    }
+}
@@ -12,7 +12,7 @@ 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.base.utils.easyexcel.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;
@@ -13,7 +13,7 @@ import com.budwk.app.base.model.ExcelImportRes;
 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.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.zhgh.welfare.mode.WelfareUserImportExcel;
 import com.budwk.app.zhgh.welfare.mode.WelfareUserTemp;