DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
王文昊
2026-07-09 14:41:43 +08:00
parent c1a9d36199 39dae0b357
commit 2150fa1fda
15 changed files with 479 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
klp-perf/src/main/java/com/klp/perf/controller/PerfEmployeeInfoController.java
View File

@@ -1,99 +0,0 @@
package com.klp.perf.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.perf.domain.vo.PerfEmployeeInfoVo;
import com.klp.perf.domain.bo.PerfEmployeeInfoBo;
import com.klp.perf.service.IPerfEmployeeInfoService;
import com.klp.common.core.page.TableDataInfo;
/**
* 员工绩效薪资基本信息
*
* @author klp
* @date 2026-07-07
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/perf/employeeInfo")
public class PerfEmployeeInfoController extends BaseController {
private final IPerfEmployeeInfoService iPerfEmployeeInfoService;
/**
* 查询员工绩效薪资基本信息列表
*/
@GetMapping("/list")
public TableDataInfo<PerfEmployeeInfoVo> list(PerfEmployeeInfoBo bo, PageQuery pageQuery) {
return iPerfEmployeeInfoService.queryPageList(bo, pageQuery);
}
/**
* 导出员工绩效薪资基本信息列表
*/
@Log(title = "员工绩效薪资基本信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(PerfEmployeeInfoBo bo, HttpServletResponse response) {
List<PerfEmployeeInfoVo> list = iPerfEmployeeInfoService.queryList(bo);
ExcelUtil.exportExcel(list, "员工绩效薪资基本信息", PerfEmployeeInfoVo.class, response);
}
/**
* 获取员工绩效薪资基本信息详细信息
*
* @param id 主键
*/
@GetMapping("/{id}")
public R<PerfEmployeeInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iPerfEmployeeInfoService.queryById(id));
}
/**
* 新增员工绩效薪资基本信息
*/
@Log(title = "员工绩效薪资基本信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody PerfEmployeeInfoBo bo) {
return toAjax(iPerfEmployeeInfoService.insertByBo(bo));
}
/**
* 修改员工绩效薪资基本信息
*/
@Log(title = "员工绩效薪资基本信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PerfEmployeeInfoBo bo) {
return toAjax(iPerfEmployeeInfoService.updateByBo(bo));
}
/**
* 删除员工绩效薪资基本信息
*
* @param ids 主键串
*/
@Log(title = "员工绩效薪资基本信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iPerfEmployeeInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

66
klp-perf/src/main/java/com/klp/perf/domain/PerfEmployeeInfo.java
View File

@@ -1,66 +0,0 @@
package com.klp.perf.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 员工绩效薪资基本信息对象 perf_employee_info
*
* @author klp
* @date 2026-07-07
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("perf_employee_info")
public class PerfEmployeeInfo extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 关联现有员工表主键
*/
private Long employeeId;
/**
* 关联 perf_dept.id (冗余,便于按部门查询)
*/
private Long deptId;
/**
* 岗位/工种
*/
private String positionName;
/**
* 底薪(元)
*/
private BigDecimal baseSalary;
/**
* 岗位绩效基数(元), 默认≈底薪×20%
*/
private BigDecimal perfBase;
/**
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
*/
private BigDecimal posCoeffDefault;
/**
* 是否在职 1=在职 0=离职
*/
private Long isActive;
/**
* 删除标志（0=正常，1=已删除）
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

67
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfEmployeeInfoBo.java
View File

@@ -1,67 +0,0 @@
package com.klp.perf.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.math.BigDecimal;
/**
* 员工绩效薪资基本信息业务对象 perf_employee_info
*
* @author klp
* @date 2026-07-07
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class PerfEmployeeInfoBo extends BaseEntity {
/**
*
*/
private Long id;
/**
* 关联现有员工表主键
*/
private Long employeeId;
/**
* 关联 perf_dept.id (冗余,便于按部门查询)
*/
private Long deptId;
/**
* 岗位/工种
*/
private String positionName;
/**
* 底薪(元)
*/
private BigDecimal baseSalary;
/**
* 岗位绩效基数(元), 默认≈底薪×20%
*/
private BigDecimal perfBase;
/**
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
*/
private BigDecimal posCoeffDefault;
/**
* 是否在职 1=在职 0=离职
*/
private Long isActive;
/**
* 备注
*/
private String remark;
}

78
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfEmployeeInfoVo.java
View File

@@ -1,78 +0,0 @@
package com.klp.perf.domain.vo;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 员工绩效薪资基本信息视图对象 perf_employee_info
*
* @author klp
* @date 2026-07-07
*/
@Data
@ExcelIgnoreUnannotated
public class PerfEmployeeInfoVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 关联现有员工表主键
*/
@ExcelProperty(value = "关联现有员工表主键")
private Long employeeId;
/**
* 关联 perf_dept.id (冗余,便于按部门查询)
*/
@ExcelProperty(value = "关联 perf_dept.id (冗余,便于按部门查询)")
private Long deptId;
/**
* 岗位/工种
*/
@ExcelProperty(value = "岗位/工种")
private String positionName;
/**
* 底薪(元)
*/
@ExcelProperty(value = "底薪(元)")
private BigDecimal baseSalary;
/**
* 岗位绩效基数(元), 默认≈底薪×20%
*/
@ExcelProperty(value = "岗位绩效基数(元), 默认≈底薪×20%")
private BigDecimal perfBase;
/**
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
*/
@ExcelProperty(value = "默认岗位系数(初始值,后续月度由绩效自动覆盖)")
private BigDecimal posCoeffDefault;
/**
* 是否在职 1=在职 0=离职
*/
@ExcelProperty(value = "是否在职 1=在职 0=离职")
private Long isActive;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
klp-perf/src/main/java/com/klp/perf/mapper/PerfEmployeeInfoMapper.java
View File

@@ -1,15 +0,0 @@
package com.klp.perf.mapper;
import com.klp.perf.domain.PerfEmployeeInfo;
import com.klp.perf.domain.vo.PerfEmployeeInfoVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 员工绩效薪资基本信息Mapper接口
*
* @author klp
* @date 2026-07-07
*/
public interface PerfEmployeeInfoMapper extends BaseMapperPlus<PerfEmployeeInfoMapper, PerfEmployeeInfo, PerfEmployeeInfoVo> {
}

49
klp-perf/src/main/java/com/klp/perf/service/IPerfEmployeeInfoService.java
View File

@@ -1,49 +0,0 @@
package com.klp.perf.service;
import com.klp.perf.domain.PerfEmployeeInfo;
import com.klp.perf.domain.vo.PerfEmployeeInfoVo;
import com.klp.perf.domain.bo.PerfEmployeeInfoBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 员工绩效薪资基本信息Service接口
*
* @author klp
* @date 2026-07-07
*/
public interface IPerfEmployeeInfoService {
/**
* 查询员工绩效薪资基本信息
*/
PerfEmployeeInfoVo queryById(Long id);
/**
* 查询员工绩效薪资基本信息列表
*/
TableDataInfo<PerfEmployeeInfoVo> queryPageList(PerfEmployeeInfoBo bo, PageQuery pageQuery);
/**
* 查询员工绩效薪资基本信息列表
*/
List<PerfEmployeeInfoVo> queryList(PerfEmployeeInfoBo bo);
/**
* 新增员工绩效薪资基本信息
*/
Boolean insertByBo(PerfEmployeeInfoBo bo);
/**
* 修改员工绩效薪资基本信息
*/
Boolean updateByBo(PerfEmployeeInfoBo bo);
/**
* 校验并批量删除员工绩效薪资基本信息信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

115
klp-perf/src/main/java/com/klp/perf/service/impl/PerfEmployeeInfoServiceImpl.java
View File

@@ -1,115 +0,0 @@
package com.klp.perf.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.perf.domain.bo.PerfEmployeeInfoBo;
import com.klp.perf.domain.vo.PerfEmployeeInfoVo;
import com.klp.perf.domain.PerfEmployeeInfo;
import com.klp.perf.mapper.PerfEmployeeInfoMapper;
import com.klp.perf.service.IPerfEmployeeInfoService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 员工绩效薪资基本信息Service业务层处理
*
* @author klp
* @date 2026-07-07
*/
@RequiredArgsConstructor
@Service
public class PerfEmployeeInfoServiceImpl implements IPerfEmployeeInfoService {
private final PerfEmployeeInfoMapper baseMapper;
/**
* 查询员工绩效薪资基本信息
*/
@Override
public PerfEmployeeInfoVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 查询员工绩效薪资基本信息列表
*/
@Override
public TableDataInfo<PerfEmployeeInfoVo> queryPageList(PerfEmployeeInfoBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<PerfEmployeeInfo> lqw = buildQueryWrapper(bo);
Page<PerfEmployeeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询员工绩效薪资基本信息列表
*/
@Override
public List<PerfEmployeeInfoVo> queryList(PerfEmployeeInfoBo bo) {
LambdaQueryWrapper<PerfEmployeeInfo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<PerfEmployeeInfo> buildQueryWrapper(PerfEmployeeInfoBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PerfEmployeeInfo> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getEmployeeId() != null, PerfEmployeeInfo::getEmployeeId, bo.getEmployeeId());
lqw.eq(bo.getDeptId() != null, PerfEmployeeInfo::getDeptId, bo.getDeptId());
lqw.like(StringUtils.isNotBlank(bo.getPositionName()), PerfEmployeeInfo::getPositionName, bo.getPositionName());
lqw.eq(bo.getBaseSalary() != null, PerfEmployeeInfo::getBaseSalary, bo.getBaseSalary());
lqw.eq(bo.getPerfBase() != null, PerfEmployeeInfo::getPerfBase, bo.getPerfBase());
lqw.eq(bo.getPosCoeffDefault() != null, PerfEmployeeInfo::getPosCoeffDefault, bo.getPosCoeffDefault());
lqw.eq(bo.getIsActive() != null, PerfEmployeeInfo::getIsActive, bo.getIsActive());
return lqw;
}
/**
* 新增员工绩效薪资基本信息
*/
@Override
public Boolean insertByBo(PerfEmployeeInfoBo bo) {
PerfEmployeeInfo add = BeanUtil.toBean(bo, PerfEmployeeInfo.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改员工绩效薪资基本信息
*/
@Override
public Boolean updateByBo(PerfEmployeeInfoBo bo) {
PerfEmployeeInfo update = BeanUtil.toBean(bo, PerfEmployeeInfo.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(PerfEmployeeInfo entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除员工绩效薪资基本信息
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

25
klp-perf/src/main/resources/mapper/perf/PerfEmployeeInfoMapper.xml
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.perf.mapper.PerfEmployeeInfoMapper">
<resultMap type="com.klp.perf.domain.PerfEmployeeInfo" id="PerfEmployeeInfoResult">
<result property="id" column="id"/>
<result property="employeeId" column="employee_id"/>
<result property="deptId" column="dept_id"/>
<result property="positionName" column="position_name"/>
<result property="baseSalary" column="base_salary"/>
<result property="perfBase" column="perf_base"/>
<result property="posCoeffDefault" column="pos_coeff_default"/>
<result property="isActive" column="is_active"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>

153
klp-ui/src/components/HomeModules/QuickAccessGroup.vue
View File

@@ -24,8 +24,8 @@
<span class="debug-value">{{ mergedItemsText }}</span>
</div>
</div> -->
<el-row :gutter="10" class="panel-group">
<el-col :xs="24" :sm="12" :md="12" :lg="12" class="card-panel-col" v-for="item in homeItems" :key="item.key">
<el-row :gutter="8" class="panel-group">
<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="card-panel-col" v-for="item in homeItems" :key="item.key">
<div class="card-panel" :class="{ 'is-add': item.isAdd }" @click="handleCardClick(item)">
<template v-if="item.isAdd">
<div class="card-panel-add">
@@ -52,7 +52,7 @@
</el-col>
</el-row>
<el-dialog title="配置快捷入口" :visible.sync="configVisible" width="1120px" top="5vh" custom-class="quick-access-dialog">
<el-dialog title="配置快捷入口" :visible.sync="configVisible" width="1120px" top="5vh" custom-class="quick-access-dialog" append-to-body>
<div class="quick-access-config-bar">
<el-form inline size="mini">
<el-form-item label="用户">
@@ -1185,7 +1185,7 @@ export default {
<style lang="scss" scoped>
.quick-access {
margin-top: 18px;
margin-top: 0;
}
.quick-access-debug-bar {
@@ -1395,11 +1395,11 @@ export default {
.panel-group {
.card-panel-col {
margin-bottom: 32px;
margin-bottom: 8px;
}
.card-panel {
height: 108px;
height: 72px;
cursor: pointer;
font-size: 12px;
position: relative;
@@ -1408,75 +1408,78 @@ export default {
align-items: center;
color: #666;
background: #fff;
border: 1px solid rgba(0, 0, 0, 0.06);
border: 1px solid #ebeef5;
border-radius: 10px;
box-shadow: 0 6px 18px rgba(0, 0, 0, 0.06);
box-shadow: 0 2px 8px rgba(15, 23, 42, 0.04);
transition: transform 0.18s ease, box-shadow 0.18s ease, border-color 0.18s ease;
&:hover {
transform: translateY(-3px);
border-color: rgba(64, 158, 255, 0.35);
box-shadow: 0 12px 34px rgba(0, 0, 0, 0.1);
transform: translateY(-1px);
border-color: rgba(64, 158, 255, 0.28);
box-shadow: 0 10px 22px rgba(15, 23, 42, 0.08);
.card-panel-icon-wrapper {
color: #fff;
background: linear-gradient(135deg, #409eff 0%, #66b1ff 100%);
box-shadow: 0 10px 18px rgba(64, 158, 255, 0.25);
border-color: rgba(64, 158, 255, 0.18);
background: linear-gradient(135deg, rgba(64, 158, 255, 0.14) 0%, rgba(64, 158, 255, 0.08) 100%);
}
}
&.is-add {
border-style: dashed;
background: #fafafa;
background: linear-gradient(180deg, #fbfcfe 0%, #f7f9fc 100%);
justify-content: center;
}
&.is-add:hover {
border-color: rgba(64, 158, 255, 0.5);
background: rgba(64, 158, 255, 0.04);
background: rgba(64, 158, 255, 0.03);
.card-panel-add-icon {
background: linear-gradient(135deg, #409eff 0%, #66b1ff 100%);
color: #fff;
box-shadow: 0 10px 18px rgba(64, 158, 255, 0.25);
border-color: rgba(64, 158, 255, 0.18);
background: linear-gradient(135deg, rgba(64, 158, 255, 0.14) 0%, rgba(64, 158, 255, 0.08) 100%);
}
}
.card-panel-icon-wrapper {
flex: 0 0 auto;
margin: 0 14px 0 14px;
padding: 16px;
width: 34px;
height: 34px;
margin: 0 10px;
display: flex;
align-items: center;
justify-content: center;
transition: all 0.18s ease;
border-radius: 10px;
border-radius: 8px;
color: #409eff;
background: linear-gradient(135deg, rgba(64, 158, 255, 0.18) 0%, rgba(64, 158, 255, 0.08) 100%);
box-shadow: inset 0 0 0 1px rgba(64, 158, 255, 0.1);
border: 1px solid rgba(64, 158, 255, 0.12);
background: linear-gradient(135deg, rgba(64, 158, 255, 0.12) 0%, rgba(64, 158, 255, 0.05) 100%);
}
.card-panel-icon {
font-size: 34px;
font-size: 16px;
}
.card-panel-description {
flex: 1;
min-width: 0;
font-weight: 600;
margin: 0 18px 0 0;
font-weight: 500;
margin: 0 10px 0 0;
.card-panel-text {
line-height: 20px;
line-height: 17px;
color: rgba(0, 0, 0, 0.75);
font-size: 16px;
margin-bottom: 6px;
font-size: 13px;
margin-bottom: 1px;
font-weight: 600;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.card-panel-subtext {
font-size: 12px;
color: rgba(0, 0, 0, 0.45);
line-height: 16px;
font-size: 10px;
color: #909399;
line-height: 14px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -1492,40 +1495,41 @@ export default {
.card-panel-add-icon {
flex: 0 0 auto;
width: 56px;
height: 56px;
margin: 0 14px 0 14px;
border-radius: 12px;
width: 34px;
height: 34px;
margin: 0 10px;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
font-size: 26px;
font-size: 16px;
color: #409eff;
background: rgba(64, 158, 255, 0.12);
border: 1px solid rgba(64, 158, 255, 0.12);
background: linear-gradient(135deg, rgba(64, 158, 255, 0.12) 0%, rgba(64, 158, 255, 0.05) 100%);
transition: all 0.18s ease;
box-shadow: inset 0 0 0 1px rgba(64, 158, 255, 0.1);
}
.card-panel-add-text {
flex: 1;
min-width: 0;
margin: 0 18px 0 0;
font-weight: 600;
margin: 0 10px 0 0;
font-weight: 500;
.card-panel-text {
line-height: 20px;
line-height: 17px;
color: rgba(0, 0, 0, 0.75);
font-size: 16px;
margin-bottom: 6px;
font-size: 13px;
margin-bottom: 1px;
font-weight: 600;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.card-panel-subtext {
font-size: 12px;
color: rgba(0, 0, 0, 0.45);
line-height: 16px;
font-size: 10px;
color: #909399;
line-height: 14px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -1555,25 +1559,32 @@ export default {
.panel-group {
.card-panel {
.card-panel-icon-wrapper {
margin-right: 10px;
padding: 14px;
width: 32px;
height: 32px;
}
.card-panel-icon {
font-size: 30px;
font-size: 15px;
}
.card-panel-description {
margin-right: 12px;
.card-panel-text {
font-size: 15px;
font-size: 12px;
}
}
}
}
}
@media screen and (min-width: 1200px) {
.panel-group {
.card-panel-col {
flex: 0 0 20%;
max-width: 20%;
}
}
}
@media screen and (max-width: 768px) {
.quick-access-config-body {
flex-direction: column;
@@ -1587,26 +1598,48 @@ export default {
.panel-group {
.card-panel {
height: 92px;
height: 68px;
.card-panel-icon-wrapper {
padding: 12px;
margin: 0 8px;
width: 30px;
height: 30px;
}
.card-panel-icon {
font-size: 24px;
font-size: 14px;
}
.card-panel-description {
margin-right: 10px;
margin-right: 8px;
.card-panel-text {
font-size: 14px;
margin-bottom: 6px;
font-size: 12px;
margin-bottom: 1px;
}
.card-panel-subtext {
font-size: 10px;
}
}
.card-panel-add-icon {
width: 30px;
height: 30px;
margin: 0 8px;
font-size: 14px;
}
.card-panel-add-text {
margin-right: 8px;
.card-panel-text {
font-size: 12px;
margin-bottom: 1px;
}
.card-panel-subtext {
font-size: 10px;
}
}
}

429
klp-ui/src/views/index.vue
View File

@@ -1,51 +1,83 @@
<template>
<div class="dashboard-editor-container">
<img src="http://kelunpuzhonggong.com/upload/img/20250427091033.jpg" alt="">
<div class="aboutus">
<el-row :gutter="30">
<!-- 左栏 -->
<el-col :span="12" :xs="24">
<div class="aboutus-title">
<div class="home-workspace">
<div class="workspace-shell">
<el-row :gutter="20" class="workspace-grid workspace-grid--top">
<el-col :xs="24" :sm="24" :md="8" :lg="7" :xl="6">
<div class="workspace-card summary-card">
<div class="module-title">
<h2>关于我们</h2>
<p>ABOUT US</p>
</div>
<div class="aboutus-left">
<p class="aboutus-lead">
嘉祥科伦普重工有限公司是山东省重点工程项目，也是科伦普产品结构调整的重要工程项目，聚焦高铁装备、模具制造和涂镀新材料研发。
</p>
<div class="aboutus-metrics">
<div class="metric-item">
<span class="metric-label">成立时间</span>
<span class="metric-value">2017年8月</span>
</div>
<div class="metric-item">
<span class="metric-label">注册资金</span>
<span class="metric-value">33100万元</span>
</div>
<div class="metric-item">
<span class="metric-label">设计年产能</span>
<span class="metric-value">150万吨</span>
</div>
<div class="metric-item">
<span class="metric-label">覆盖区域</span>
<span class="metric-value">东北 华北 华东 华南等</span>
</div>
</div>
<p class="aboutus-desc">
嘉祥科伦普重工有限公司是山东省重点工程项目，是济宁市工程之一，也是科伦普产品结构调整重要的工程项目。工程采用了外方技术总负责、关键设备整体引进、点采集成、国内技术总成、自主创新、单体设备引进等多种建设方案，保证了技术先进和人才的培养，确保工程投产后达产达效。
工程采用外方技术总负责、关键设备整体引进、国内技术总成、自主创新等多种建设方案，既保证技术先进性，也兼顾人才培养与项目达产达效。
</p>
<p class="aboutus-desc">
科伦普冷轧重工有限公司是设计年产量150万吨，能向广大用户提供热轧酸洗、热轧镀锌、冷硬、罩式退火、冷轧镀锌、铝锌合金、锌铝合金、锌铝镁、镀铬等各大类产品。产品覆盖东北、华北、华东、华南等地区。
公司设计年产量150万吨，产品覆盖热轧酸洗、热轧镀锌、冷硬、罩式退火、冷轧镀锌、铝锌合金、锌铝合金、锌铝镁、镀铬等多个大类。
</p>
</div>
<quick-access-group />
</div>
</el-col>
<!-- 右栏 -->
<el-col :span="12" :xs="24">
<img src="http://kelunpuzhonggong.com/upload/img/20251015103934.jpg" alt="">
<!-- <div class="aboutus-right">
<el-col :xs="24" :sm="24" :md="16" :lg="17" :xl="18">
<div class="workspace-card detail-card">
<div class="module-title">
<h2>企业介绍</h2>
<p>COMPANY PROFILE</p>
</div>
<div class="aboutus-right">
<div class="detail-section">
<h3>企业概况</h3>
<p class="aboutus-detail">
嘉祥科伦普重工有限公司成立于2017年8月，注册资金33100万元，主要经营高铁设备、配件制造与销售，模具制造与销售，新材料技术研发，高性能有色金属及合金材料销售，机械零件、零部件加工与销售，金属材料制造与销售，锌铝镁新材料等。目前公司拥有10余项具有自主知识产权的发明专利技术，综合技术水平达国内领先，2024年公司主导产品国内市场占有率约占85%。2024年总资产5.98亿元，净资产4.49亿元，收入3.95亿元，公司现有员工238人，研究与试验发展人员57人，其中专职研究与试验发展人员52人，外聘专家5人。
</p>
</div>
<div class="detail-section">
<h3>项目建设</h3>
<p class="aboutus-detail">
2024年公司新建科伦普合金新材料研发项目，占地290亩，采用国内先进的镀层核心技术和热处理工艺，专业生产锌铝镁板材和镀铬板材。致力于打造国内工艺链条最完善、产品型号最丰富的涂镀新材料生产企业。全部投产后可实现新增销售收入80亿元，利税4.7亿元，带动就业约500人。项目主要生产的冷轧板、锌铝镁涂层板、镀铬涂层板、镀锡涂层板等产品，涵盖0.08MM-6.0MM区间60多种产品，是国内单个企业产品种类最多的项目。产品因其防锈、耐氧化、耐腐蚀、高电导、高稳定的优秀特性，广泛应用于建筑结构件、汽车制造、轻工家电、食品包装、医疗器械、电子通讯、航空航天领域。
</p>
</div> -->
</div>
</div>
</div>
</el-col>
</el-row>
</div>
<!-- <AllApplications />
<el-row :gutter="10">
<el-col :span="18">
<el-empty description="办公模块定制开发中"></el-empty>
</el-col>
<el-col :span="6">
<mini-calendar />
</el-col>
</el-row> -->
<div class="workspace-card quick-card quick-card--full">
<div class="module-title module-title--inline">
<div>
<h2>快捷入口</h2>
<p>WORKSPACE</p>
</div>
<span class="module-title-tip">支持按权限自动展示，并可配置本人常用入口</span>
</div>
<quick-access-group />
</div>
</div>
</div>
</template>
@@ -67,7 +99,7 @@ export default {
<style lang="scss" scoped>
.dashboard-editor-container {
background-color: #fff;
background: #f5f7fa;
position: relative;
img {
@@ -82,111 +114,270 @@ export default {
}
}
// 关于我们区域样式
.aboutus {
padding: 20px;
max-width: 1200px;
margin: 0 auto;
.home-workspace {
padding: 0 60px 32px;
}
// 标题
.aboutus-title {
margin-bottom: 25px;
h2 {
font-size: 28px;
color: #333;
.workspace-shell {
width: 100%;
max-width: none;
margin: 0;
margin-top: -36px;
position: relative;
}
.workspace-grid--top {
display: flex;
flex-wrap: wrap;
align-items: stretch;
margin-bottom: 20px;
}
.workspace-grid--top > .el-col {
display: flex;
margin-bottom: 20px;
}
.workspace-card {
width: 100%;
height: 100%;
padding: 28px;
background: #fff;
border: 1px solid rgba(15, 23, 42, 0.05);
border-radius: 18px;
box-shadow: 0 14px 36px rgba(15, 23, 42, 0.06);
}
.module-title {
margin-bottom: 20px;
h2 {
margin: 0;
font-size: 28px;
line-height: 36px;
font-weight: 600;
color: #303133;
}
p {
font-size: 14px;
color: #999;
margin: 5px 0 0 0;
}
}
// 左栏
.aboutus-left {
text-indent: 2em;
line-height: 2em;
font-size: 14px;
.aboutus-desc {
color: #666;
line-height: 1.8;
margin-bottom: 18px;
}
// 特色模块
.aboutus-features {
display: flex;
justify-content: space-between;
margin: 30px 0;
.feature-item {
display: flex;
flex-direction: column;
align-items: center;
.feature-icon {
width: 42px;
height: 42px;
border-radius: 50%;
background-color: #9370db; // 截图紫色图标背景
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 10px;
.icon {
color: #fff;
font-size: 22px;
}
}
.feature-text {
font-size: 14px;
color: #333;
}
}
}
// 按钮
.read-more-btn {
border: 1px solid #333;
background: transparent;
padding: 8px 22px;
font-size: 14px;
cursor: pointer;
transition: background 0.3s;
&:hover {
background-color: #f5f5f5;
}
}
}
// 右栏
.aboutus-right {
.aboutus-detail {
font-size: 14px;
color: #666;
line-height: 1.8;
margin-bottom: 18px;
}
margin: 6px 0 0;
font-size: 13px;
line-height: 20px;
color: #909399;
letter-spacing: 1px;
}
}
// 响应式适配
@media (max-width: 1024px) {
.dashboard-editor-container {
.aboutus {
padding: 20px 25px;
.module-title--inline {
display: flex;
align-items: flex-start;
justify-content: space-between;
gap: 16px;
}
.el-row {
.el-col:first-child {
margin-bottom: 30px;
.module-title-tip {
flex: 0 0 auto;
font-size: 13px;
line-height: 20px;
color: #909399;
padding-top: 8px;
}
.aboutus-left {
font-size: 14px;
line-height: 26px;
}
.aboutus-lead {
margin: 0;
color: #303133;
font-size: 15px;
line-height: 28px;
font-weight: 500;
}
.aboutus-metrics {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 10px;
margin: 18px 0;
}
.metric-item {
min-width: 0;
padding: 12px 14px;
border-radius: 12px;
background: linear-gradient(180deg, #fbfcfe 0%, #f7f9fc 100%);
border: 1px solid #eef2f7;
}
.metric-label {
display: block;
margin-bottom: 6px;
font-size: 12px;
line-height: 18px;
color: #909399;
}
.metric-value {
display: block;
font-size: 14px;
line-height: 20px;
font-weight: 600;
color: #303133;
}
.aboutus-desc,
.aboutus-detail {
margin: 0;
color: #606266;
font-size: 14px;
line-height: 26px;
}
.aboutus-desc + .aboutus-desc,
.aboutus-detail + .aboutus-detail {
margin-top: 16px;
}
.aboutus-right {
display: block;
}
.quick-card {
margin-top: 20px;
padding: 20px 20px 16px;
}
.quick-card--full {
width: 100%;
}
.quick-card .module-title {
margin-bottom: 14px;
}
.summary-card {
min-height: 100%;
display: flex;
flex-direction: column;
}
.detail-card {
margin-top: 0;
}
.detail-section + .detail-section {
margin-top: 24px;
padding-top: 24px;
border-top: 1px solid #ebeef5;
}
.detail-section h3 {
margin: 0 0 10px;
font-size: 18px;
line-height: 26px;
font-weight: 600;
color: #303133;
}
.detail-section .aboutus-detail {
font-size: 15px;
line-height: 28px;
color: #5f6b7a;
}
@media (max-width: 1024px) {
.home-workspace {
padding: 0 36px 28px;
}
.workspace-shell {
margin-top: -20px;
}
.workspace-card {
padding: 20px;
}
.quick-card {
padding: 18px 18px 14px;
}
.workspace-grid--top > .el-col {
margin-bottom: 16px;
}
.module-title h2 {
font-size: 24px;
line-height: 32px;
}
.aboutus-metrics {
grid-template-columns: 1fr;
}
}
@media (max-width: 768px) {
.home-workspace {
padding: 0 28px 24px;
}
.workspace-shell {
margin-top: 12px;
}
.workspace-card {
padding: 18px 16px;
border-radius: 14px;
}
.quick-card {
padding: 16px 14px 12px;
}
.workspace-grid--top {
display: block;
margin-bottom: 16px;
}
.workspace-grid--top > .el-col {
display: block;
margin-bottom: 12px;
}
.module-title--inline {
display: block;
}
.module-title-tip {
display: block;
margin-top: 8px;
padding-top: 0;
}
.detail-card {
margin-top: 0;
}
.detail-section + .detail-section {
margin-top: 18px;
padding-top: 18px;
}
.quick-card {
margin-top: 12px;
}
.aboutus-lead {
font-size: 14px;
line-height: 26px;
}
.detail-section .aboutus-detail {
font-size: 14px;
line-height: 26px;
}
}
</style>

13
klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
View File

@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
@@ -86,6 +87,18 @@ public class WmsEmployeeInfo extends BaseEntity {
* 社保类型（三险/五险）
*/
private String socialInsuranceType;
/**
* 底薪(元)
*/
private BigDecimal baseSalary;
/**
* 岗位绩效基数(元), 默认≈底薪×20%
*/
private BigDecimal perfBase;
/**
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
*/
private BigDecimal posCoeffDefault;
/**
* 逻辑删除标识：0=正常，1=已删
*/

16
klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
View File

@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -114,6 +115,21 @@ public class WmsEmployeeInfoBo extends BaseEntity {
*/
private String socialInsuranceType;
/**
* 底薪(元)
*/
private BigDecimal baseSalary;
/**
* 岗位绩效基数(元), 默认≈底薪×20%
*/
private BigDecimal perfBase;
/**
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
*/
private BigDecimal posCoeffDefault;
/**
* 备注
*/

19
klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
View File

@@ -1,6 +1,7 @@
package com.klp.domain.vo;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -117,6 +118,24 @@ public class WmsEmployeeInfoVo {
*/
private String socialInsuranceType;
/**
* 底薪(元)
*/
@ExcelProperty(value = "底薪(元)")
private BigDecimal baseSalary;
/**
* 岗位绩效基数(元), 默认≈底薪×20%
*/
@ExcelProperty(value = "岗位绩效基数(元)")
private BigDecimal perfBase;
/**
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
*/
@ExcelProperty(value = "默认岗位系数")
private BigDecimal posCoeffDefault;
/**
* 备注
*/

3
klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
View File

@@ -81,6 +81,9 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship());
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone());
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
lqw.eq(bo.getBaseSalary() != null, WmsEmployeeInfo::getBaseSalary, bo.getBaseSalary());
lqw.eq(bo.getPerfBase() != null, WmsEmployeeInfo::getPerfBase, bo.getPerfBase());
lqw.eq(bo.getPosCoeffDefault() != null, WmsEmployeeInfo::getPosCoeffDefault, bo.getPosCoeffDefault());
// 是否离职
lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
// 离职时间范围查询

3
klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
View File

@@ -21,6 +21,9 @@
<result property="relationship" column="relationship"/>
<result property="emergencyContactPhone" column="emergency_contact_phone"/>
<result property="socialInsuranceType" column="social_insurance_type"/>
<result property="baseSalary" column="base_salary"/>
<result property="perfBase" column="perf_base"/>
<result property="posCoeffDefault" column="pos_coeff_default"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>