cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

dev
huwei 2026-08-03 17:59:18 +08:00
parent b5ae7da17f a439eb098a
commit 360533f73e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java
View File

@ -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.AccountDO;
import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelDO; import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelDO;
import org.qinan.safetyeval.infrastructure.mapper.AccountMapper; 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.OrgPersonnelMapper;
import org.qinan.safetyeval.infrastructure.mapper.QualFilingExpertMapper;
import org.qinan.safetyeval.infrastructure.remote.SmsRemote; import org.qinan.safetyeval.infrastructure.remote.SmsRemote;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -52,7 +52,7 @@ public class AccountExecutor implements AccountApi {
@Autowired @Autowired
private SmsRemote smsRemote; private SmsRemote smsRemote;
@Autowired @Autowired
private OrgInfoMapper orgInfoMapper; private QualFilingExpertMapper qualFilingExpertMapper;
@Autowired @Autowired
private AccountMapper accountMapper; private AccountMapper accountMapper;
@Autowired @Autowired
@ -166,7 +166,6 @@ public class AccountExecutor implements AccountApi {
@Override @Override
public SingleResponse<Integer> checkTerminalType() { public SingleResponse<Integer> checkTerminalType() {
log.info("同步用户信息:{}", AuthUserContextAdapter.getCurrentUser()); log.info("同步用户信息:{}", AuthUserContextAdapter.getCurrentUser());
System.err.println(AuthUserContextAdapter.getCurrentUser());
AccountEntity accountEntity = accountDomainService.get(AuthUserContextAdapter.getCurrentUserId()); AccountEntity accountEntity = accountDomainService.get(AuthUserContextAdapter.getCurrentUserId());
OrgPersonnelDO orgPersonnelDO = orgPersonnelMapper.selectById(AuthUserContextAdapter.getCurrentUserId()); OrgPersonnelDO orgPersonnelDO = orgPersonnelMapper.selectById(AuthUserContextAdapter.getCurrentUserId());
int type; int type;

5
safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java
View File

@ -1,5 +1,6 @@
package org.qinan.safetyeval.app.support; package org.qinan.safetyeval.app.support;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data; import lombok.Data;
@ -72,14 +73,18 @@ public class OrgPersonnelImportRow {
private String abilityDeclaration; private String abilityDeclaration;
/** EasyExcel 解析时记录的物理行号（从1开始，含表头），由导入器填充。 */ /** EasyExcel 解析时记录的物理行号（从1开始，含表头），由导入器填充。 */
@ExcelIgnore
private Integer rowIndex; private Integer rowIndex;
/** 校验通过后回填的部门ID（非Excel列）。 */ /** 校验通过后回填的部门ID（非Excel列）。 */
@ExcelIgnore
private Long deptId; private Long deptId;
/** 校验通过后回填的岗位ID（非Excel列）。 */ /** 校验通过后回填的岗位ID（非Excel列）。 */
@ExcelIgnore
private Long postId; private Long postId;
/** 校验通过后回填的学科基础专业对照表ID（非Excel列）。 */ /** 校验通过后回填的学科基础专业对照表ID（非Excel列）。 */
@ExcelIgnore
private Long basicDisciplineMajorId; private Long basicDisciplineMajorId;
} }