From 6a78222dea0a7ee337ddb82289e4059a7996fcbb Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 24 Oct 2025 16:37:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-kaohe/pom.xml | 4 + .../com/ruoyi/kaohe/domain/KhEmployee.java | 4 +- .../service/impl/KhEmployeeServiceImpl.java | 73 ++++++++----------- .../service/impl/KhKhrwResultServiceImpl.java | 2 +- 4 files changed, 37 insertions(+), 46 deletions(-) diff --git a/ruoyi-kaohe/pom.xml b/ruoyi-kaohe/pom.xml index f024544..f68c93e 100644 --- a/ruoyi-kaohe/pom.xml +++ b/ruoyi-kaohe/pom.xml @@ -32,6 +32,10 @@ json 20210307 + + com.ruoyi + ruoyi-system + \ No newline at end of file diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java index 916105d..64c83a3 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java @@ -26,9 +26,9 @@ public class KhEmployee extends BaseEntity { private Long userId; /** - * 职工所属部门 + * 部门ID */ - @Excel(name = "职工所属部门") + @Excel(name = "部门ID") private Long deptId; /** diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java index b632232..f36a839 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java @@ -2,12 +2,14 @@ package com.ruoyi.kaohe.service.impl; import java.util.List; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.BeanValidators; +import com.ruoyi.system.mapper.SysDeptMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,145 +22,130 @@ import javax.annotation.Resource; /** * 职工信息Service业务层处理 - * + * * @author hs * @date 2025-06-17 */ @Service -public class KhEmployeeServiceImpl implements IKhEmployeeService -{ +public class KhEmployeeServiceImpl implements IKhEmployeeService { @Resource private KhEmployeeMapper khEmployeeMapper; + @Resource + private SysDeptMapper deptMapper; private static final Logger log = LoggerFactory.getLogger(KhEmployeeServiceImpl.class); /** * 查询职工信息 - * + * * @param id 职工信息主键 * @return 职工信息 */ @Override - public KhEmployee selectKhEmployeeById(Long id) - { + public KhEmployee selectKhEmployeeById(Long id) { return khEmployeeMapper.selectKhEmployeeById(id); } /** * 查询职工信息列表 - * + * * @param khEmployee 职工信息 * @return 职工信息 */ @Override - public List selectKhEmployeeList(KhEmployee khEmployee) - { + public List selectKhEmployeeList(KhEmployee khEmployee) { return khEmployeeMapper.selectKhEmployeeList(khEmployee); } /** * 新增职工信息 - * + * * @param khEmployee 职工信息 * @return 结果 */ @Override - public int insertKhEmployee(KhEmployee khEmployee) - { + public int insertKhEmployee(KhEmployee khEmployee) { khEmployee.setCreateTime(DateUtils.getNowDate()); return khEmployeeMapper.insertKhEmployee(khEmployee); } /** * 修改职工信息 - * + * * @param khEmployee 职工信息 * @return 结果 */ @Override - public int updateKhEmployee(KhEmployee khEmployee) - { + public int updateKhEmployee(KhEmployee khEmployee) { khEmployee.setUpdateTime(DateUtils.getNowDate()); return khEmployeeMapper.updateKhEmployee(khEmployee); } /** * 批量删除职工信息 - * + * * @param ids 需要删除的职工信息主键 * @return 结果 */ @Override - public int deleteKhEmployeeByIds(Long[] ids) - { + public int deleteKhEmployeeByIds(Long[] ids) { return khEmployeeMapper.deleteKhEmployeeByIds(ids); } /** * 删除职工信息信息 - * + * * @param id 职工信息主键 * @return 结果 */ @Override - public int deleteKhEmployeeById(Long id) - { + public int deleteKhEmployeeById(Long id) { return khEmployeeMapper.deleteKhEmployeeById(id); } @Override public String importEmp(List empList, boolean updateSupport, String operName) { - if (StringUtils.isNull(empList) || empList.size() == 0) - { + if (StringUtils.isNull(empList) || empList.size() == 0) { throw new ServiceException("导入职工数据不能为空！"); } int successNum = 0; int failureNum = 0; StringBuilder successMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder(); - for (KhEmployee employee : empList) - { - try - { + for (KhEmployee employee : empList) { + try { + //根据deptId查询deptName + SysDept sysDept = deptMapper.selectDeptById(employee.getDeptId()); + employee.setDeptName(sysDept.getDeptName()); // 验证是否存在这个职工 KhEmployee param = new KhEmployee(); param.setEmpName(employee.getEmpName()); param.setDeptId(employee.getDeptId()); List e = khEmployeeMapper.selectKhEmployeeList(param); - if (StringUtils.isNull(e)||e.size()==0) - { + if (StringUtils.isNull(e) || e.size() == 0) { khEmployeeMapper.insertKhEmployee(employee); successNum++; successMsg.append("
" + successNum + "、账号 " + employee.getEmpName() + " 导入成功"); - } - else if (updateSupport) - { + } else if (updateSupport) { employee.setId(e.get(0).getId()); khEmployeeMapper.updateKhEmployee(employee); successNum++; successMsg.append("
" + successNum + "、账号 " + employee.getEmpName() + " 更新成功"); - } - else - { + } else { failureNum++; failureMsg.append("
" + failureNum + "、账号 " + employee.getEmpName() + " 已存在"); } - } - catch (Exception e) - { + } catch (Exception e) { failureNum++; String msg = "
" + failureNum + "、账号 " + employee.getEmpName() + " 导入失败："; failureMsg.append(msg + e.getMessage()); log.error(msg, e); } } - if (failureNum > 0) - { + if (failureNum > 0) { failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); throw new ServiceException(failureMsg.toString()); - } - else - { + } else { successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); } return successMsg.toString(); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java index 35030c5..8b54aaa 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java @@ -256,7 +256,7 @@ public class KhKhrwResultServiceImpl implements IKhKhrwResultService return AjaxResult.success("更新成功"); }else{ this.insertKhKhrwResult(pcResult); - return AjaxResult.success(); + return AjaxResult.success("生成成功"); } } }