From fbdaf64a59a7995bcf495a94dee5aa94a1a29638 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Mon, 3 Aug 2026 17:39:08 +0800 Subject: [PATCH 1/2] import --- .../org/qinan/safetyeval/app/executor/AccountExecutor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java index 21a671d..c949dec 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java @@ -20,8 +20,8 @@ import org.qinan.safetyeval.infrastructure.adapter.gbs.GbsUserFacadeClient; import org.qinan.safetyeval.infrastructure.dataobject.AccountDO; import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelDO; import org.qinan.safetyeval.infrastructure.mapper.AccountMapper; -import org.qinan.safetyeval.infrastructure.mapper.OrgInfoMapper; import org.qinan.safetyeval.infrastructure.mapper.OrgPersonnelMapper; +import org.qinan.safetyeval.infrastructure.mapper.QualFilingExpertMapper; import org.qinan.safetyeval.infrastructure.remote.SmsRemote; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -52,7 +52,7 @@ public class AccountExecutor implements AccountApi { @Autowired private SmsRemote smsRemote; @Autowired - private OrgInfoMapper orgInfoMapper; + private QualFilingExpertMapper qualFilingExpertMapper; @Autowired private AccountMapper accountMapper; @Autowired @@ -166,7 +166,6 @@ public class AccountExecutor implements AccountApi { @Override public SingleResponse checkTerminalType() { log.info("同步用户信息:{}", AuthUserContextAdapter.getCurrentUser()); - System.err.println(AuthUserContextAdapter.getCurrentUser()); AccountEntity accountEntity = accountDomainService.get(AuthUserContextAdapter.getCurrentUserId()); OrgPersonnelDO orgPersonnelDO = orgPersonnelMapper.selectById(AuthUserContextAdapter.getCurrentUserId()); int type; From a439eb098a01c6d9409d68ad57f849a608edcd29 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Mon, 3 Aug 2026 17:58:11 +0800 Subject: [PATCH 2/2] import --- .../qinan/safetyeval/app/support/OrgPersonnelImportRow.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java index 971b517..fb6eb1d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.app.support; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -72,14 +73,18 @@ public class OrgPersonnelImportRow { private String abilityDeclaration; /** EasyExcel 解析时记录的物理行号（从1开始，含表头），由导入器填充。 */ + @ExcelIgnore private Integer rowIndex; /** 校验通过后回填的部门ID（非Excel列）。 */ + @ExcelIgnore private Long deptId; /** 校验通过后回填的岗位ID（非Excel列）。 */ + @ExcelIgnore private Long postId; /** 校验通过后回填的学科基础专业对照表ID（非Excel列）。 */ + @ExcelIgnore private Long basicDisciplineMajorId; }