wkc/ccdi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增信息维护年收入字段全链路支持

Browse Source
This commit is contained in:
wkc
2026-03-17 18:07:57 +08:00
parent 82cb751b8f
commit 8f9fc09338
33 changed files with 542 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiBaseStaff.java
View File

@@ -5,6 +5,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -36,6 +37,9 @@ public class CcdiBaseStaff implements Serializable {
/** 电话 */
private String phone;
/** 年收入 */
private BigDecimal annualIncome;
/** 入职时间 */
private Date hireDate;

4
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffFmyRelation.java
View File

@@ -8,6 +8,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -53,6 +54,9 @@ public class CcdiStaffFmyRelation implements Serializable {
/** 手机号码2 */
private String mobilePhone2;
/** 家庭成员年收入 */
private BigDecimal annualIncome;
/** 微信名称1 */
private String wechatNo1;

4
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffAddDTO.java
View File

@@ -8,6 +8,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -46,6 +47,9 @@ public class CcdiBaseStaffAddDTO implements Serializable {
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "电话格式不正确")
private String phone;
/** 年收入 */
private BigDecimal annualIncome;
/** 入职时间 */
private Date hireDate;

4
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffEditDTO.java
View File

@@ -8,6 +8,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -45,6 +46,9 @@ public class CcdiBaseStaffEditDTO implements Serializable {
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "电话格式不正确")
private String phone;
/** 年收入 */
private BigDecimal annualIncome;
/** 入职时间 */
private Date hireDate;

5
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationAddDTO.java
View File

@@ -9,6 +9,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -75,6 +76,10 @@ public class CcdiStaffFmyRelationAddDTO implements Serializable {
@Schema(description = "手机号码2")
private String mobilePhone2;
/** 家庭成员年收入 */
@Schema(description = "家庭成员年收入（元/年）")
private BigDecimal annualIncome;
/** 微信名称1 */
@Size(max = 50, message = "微信名称1长度不能超过50个字符")
@Schema(description = "微信名称1")

5
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationEditDTO.java
View File

@@ -10,6 +10,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -81,6 +82,10 @@ public class CcdiStaffFmyRelationEditDTO implements Serializable {
@Schema(description = "手机号码2")
private String mobilePhone2;
/** 家庭成员年收入 */
@Schema(description = "家庭成员年收入（元/年）")
private BigDecimal annualIncome;
/** 微信名称1 */
@Size(max = 50, message = "微信名称1长度不能超过50个字符")
@Schema(description = "微信名称1")

10
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiBaseStaffExcel.java
View File

@@ -8,6 +8,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -52,13 +53,18 @@ public class CcdiBaseStaffExcel implements Serializable {
@Required
private String phone;
/** 年收入 */
@ExcelProperty(value = "年收入（元/年）", index = 5)
@ColumnWidth(18)
private BigDecimal annualIncome;
/** 入职时间 */
@ExcelProperty(value = "入职时间", index = 5)
@ExcelProperty(value = "入职时间", index = 6)
@ColumnWidth(15)
private Date hireDate;
/** 状态 */
@ExcelProperty(value = "状态", index = 6)
@ExcelProperty(value = "状态", index = 7)
@ColumnWidth(10)
@DictDropdown(dictType = "ccdi_employee_status")
@Required

22
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffFmyRelationExcel.java
View File

@@ -9,6 +9,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -77,43 +78,48 @@ public class CcdiStaffFmyRelationExcel implements Serializable {
@ColumnWidth(15)
private String mobilePhone2;
/** 家庭成员年收入 */
@ExcelProperty(value = "家庭成员年收入（元/年）", index = 9)
@ColumnWidth(18)
private BigDecimal annualIncome;
/** 微信名称1 */
@ExcelProperty(value = "微信名称1", index = 9)
@ExcelProperty(value = "微信名称1", index = 10)
@ColumnWidth(15)
private String wechatNo1;
/** 微信名称2 */
@ExcelProperty(value = "微信名称2", index = 10)
@ExcelProperty(value = "微信名称2", index = 11)
@ColumnWidth(15)
private String wechatNo2;
/** 微信名称3 */
@ExcelProperty(value = "微信名称3", index = 11)
@ExcelProperty(value = "微信名称3", index = 12)
@ColumnWidth(15)
private String wechatNo3;
/** 详细联系地址 */
@ExcelProperty(value = "详细联系地址", index = 12)
@ExcelProperty(value = "详细联系地址", index = 13)
@ColumnWidth(30)
private String contactAddress;
/** 关系详细描述 */
@ExcelProperty(value = "关系详细描述", index = 13)
@ExcelProperty(value = "关系详细描述", index = 14)
@ColumnWidth(30)
private String relationDesc;
/** 生效日期 */
@ExcelProperty(value = "生效日期", index = 14)
@ExcelProperty(value = "生效日期", index = 15)
@ColumnWidth(15)
private Date effectiveDate;
/** 失效日期 */
@ExcelProperty(value = "失效日期", index = 15)
@ExcelProperty(value = "失效日期", index = 16)
@ColumnWidth(15)
private Date invalidDate;
/** 备注 */
@ExcelProperty(value = "备注", index = 16)
@ExcelProperty(value = "备注", index = 17)
@ColumnWidth(30)
private String remark;
}

4
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiBaseStaffVO.java
View File

@@ -4,6 +4,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -37,6 +38,9 @@ public class CcdiBaseStaffVO implements Serializable {
/** 电话 */
private String phone;
/** 年收入 */
private BigDecimal annualIncome;
/** 入职时间 */
private Date hireDate;

5
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffFmyRelationVO.java
View File

@@ -6,6 +6,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -71,6 +72,10 @@ public class CcdiStaffFmyRelationVO implements Serializable {
@Schema(description = "手机号码2")
private String mobilePhone2;
/** 家庭成员年收入 */
@Schema(description = "家庭成员年收入（元/年）")
private BigDecimal annualIncome;
/** 微信名称1 */
@Schema(description = "微信名称1")
private String wechatNo1;

5
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportFailureVO.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.info.collection.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
/**
* 导入失败记录VO
*
@@ -27,6 +29,9 @@ public class ImportFailureVO {
@Schema(description = "电话")
private String phone;
@Schema(description = "年收入")
private BigDecimal annualIncome;
@Schema(description = "状态")
private String status;

6
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffFmyRelationImportFailureVO.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.info.collection.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
/**
* 员工亲属关系信息导入失败记录VO
*
@@ -41,6 +43,10 @@ public class StaffFmyRelationImportFailureVO {
@Schema(description = "手机号码1")
private String mobilePhone1;
/** 家庭成员年收入 */
@Schema(description = "家庭成员年收入")
private BigDecimal annualIncome;
/** 状态 */
@Schema(description = "状态")
private Integer status;

15
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffImportServiceImpl.java
View File

@@ -22,6 +22,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -356,5 +357,19 @@ public class CcdiBaseStaffImportServiceImpl implements ICcdiBaseStaffImportServi
if (!"0".equals(addDTO.getStatus()) && !"1".equals(addDTO.getStatus())) {
throw new RuntimeException("状态只能填写'在职'或'离职'");
}
validateAnnualIncome(addDTO.getAnnualIncome(), "年收入");
}
private void validateAnnualIncome(BigDecimal annualIncome, String fieldLabel) {
if (annualIncome == null) {
return;
}
if (annualIncome.compareTo(BigDecimal.ZERO) < 0) {
throw new RuntimeException(fieldLabel + "不能为负数");
}
if (annualIncome.scale() > 2) {
throw new RuntimeException(fieldLabel + "最多保留2位小数");
}
}
}

15
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffServiceImpl.java
View File

@@ -22,6 +22,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
/**
@@ -129,6 +130,7 @@ public class CcdiBaseStaffServiceImpl implements ICcdiBaseStaffService {
@Override
@Transactional
public int insertBaseStaff(CcdiBaseStaffAddDTO addDTO) {
validateAnnualIncome(addDTO.getAnnualIncome(), "年收入");
// 检查员工ID唯一性
if (baseStaffMapper.selectById(addDTO.getStaffId()) != null) {
throw new RuntimeException("该员工ID已存在");
@@ -158,6 +160,7 @@ public class CcdiBaseStaffServiceImpl implements ICcdiBaseStaffService {
@Override
@Transactional
public int updateBaseStaff(CcdiBaseStaffEditDTO editDTO) {
validateAnnualIncome(editDTO.getAnnualIncome(), "年收入");
CcdiBaseStaff existing = baseStaffMapper.selectById(editDTO.getStaffId());
if (existing == null) {
throw new RuntimeException("员工不存在");
@@ -276,4 +279,16 @@ public class CcdiBaseStaffServiceImpl implements ICcdiBaseStaffService {
return vo;
}
private void validateAnnualIncome(BigDecimal annualIncome, String fieldLabel) {
if (annualIncome == null) {
return;
}
if (annualIncome.compareTo(BigDecimal.ZERO) < 0) {
throw new RuntimeException(fieldLabel + "不能为负数");
}
if (annualIncome.scale() > 2) {
throw new RuntimeException(fieldLabel + "最多保留2位小数");
}
}
}

15
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationImportServiceImpl.java
View File

@@ -25,6 +25,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -338,5 +339,19 @@ public class CcdiStaffFmyRelationImportServiceImpl implements ICcdiStaffFmyRelat
throw new RuntimeException("性别只能是：男、女、其他 或 M、F、O");
}
}
validateAnnualIncome(addDTO.getAnnualIncome(), "家庭成员年收入");
}
private void validateAnnualIncome(BigDecimal annualIncome, String fieldLabel) {
if (annualIncome == null) {
return;
}
if (annualIncome.compareTo(BigDecimal.ZERO) < 0) {
throw new RuntimeException(fieldLabel + "不能为负数");
}
if (annualIncome.scale() > 2) {
throw new RuntimeException(fieldLabel + "最多保留2位小数");
}
}
}

15
ccdi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationServiceImpl.java
View File

@@ -21,6 +21,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -121,6 +122,7 @@ public class CcdiStaffFmyRelationServiceImpl implements ICcdiStaffFmyRelationSer
@Override
@Transactional
public int insertRelation(CcdiStaffFmyRelationAddDTO addDTO) {
validateAnnualIncome(addDTO.getAnnualIncome(), "家庭成员年收入");
CcdiStaffFmyRelation relation = new CcdiStaffFmyRelation();
BeanUtils.copyProperties(addDTO, relation);
@@ -146,6 +148,7 @@ public class CcdiStaffFmyRelationServiceImpl implements ICcdiStaffFmyRelationSer
@Override
@Transactional
public int updateRelation(CcdiStaffFmyRelationEditDTO editDTO) {
validateAnnualIncome(editDTO.getAnnualIncome(), "家庭成员年收入");
CcdiStaffFmyRelation existing = relationMapper.selectById(editDTO.getId());
if (existing == null) {
throw new RuntimeException("员工亲属关系不存在");
@@ -228,4 +231,16 @@ public class CcdiStaffFmyRelationServiceImpl implements ICcdiStaffFmyRelationSer
BeanUtils.copyProperties(assetInfo, assetInfoVO);
return assetInfoVO;
}
private void validateAnnualIncome(BigDecimal annualIncome, String fieldLabel) {
if (annualIncome == null) {
return;
}
if (annualIncome.compareTo(BigDecimal.ZERO) < 0) {
throw new RuntimeException(fieldLabel + "不能为负数");
}
if (annualIncome.scale() > 2) {
throw new RuntimeException(fieldLabel + "最多保留2位小数");
}
}
}

12
ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiBaseStaffMapper.xml
View File

@@ -12,6 +12,7 @@
<result property="deptName" column="dept_name"/>
<result property="idCard" column="id_card"/>
<result property="phone" column="phone"/>
<result property="annualIncome" column="annual_income"/>
<result property="hireDate" column="hire_date"/>
<result property="status" column="status"/>
<result property="createTime" column="create_time"/>
@@ -19,7 +20,7 @@
<select id="selectBaseStaffPageWithDept" resultMap="CcdiBaseStaffVOResult">
SELECT
e.staff_id, e.name, e.dept_id, e.id_card, e.phone, e.hire_date, e.status, e.create_time,
e.staff_id, e.name, e.dept_id, e.id_card, e.phone, e.annual_income, e.hire_date, e.status, e.create_time,
d.dept_name
FROM ccdi_base_staff e
LEFT JOIN sys_dept d ON e.dept_id = d.dept_id
@@ -46,18 +47,19 @@
<!-- 批量插入或更新员工信息（只更新非null字段） -->
<insert id="insertOrUpdateBatch" parameterType="java.util.List">
INSERT INTO ccdi_base_staff
(staff_id, name, dept_id, id_card, phone, hire_date, status,
(staff_id, name, dept_id, id_card, phone, annual_income, hire_date, status,
create_time, create_by, update_by, update_time)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.staffId}, #{item.name}, #{item.deptId}, #{item.idCard},
#{item.phone}, #{item.hireDate}, #{item.status}, NOW(),
#{item.phone}, #{item.annualIncome}, #{item.hireDate}, #{item.status}, NOW(),
#{item.createBy}, #{item.updateBy}, NOW())
</foreach>
ON DUPLICATE KEY UPDATE
name = COALESCE(VALUES(name), name),
dept_id = COALESCE(VALUES(dept_id), dept_id),
phone = COALESCE(VALUES(phone), phone),
annual_income = COALESCE(VALUES(annual_income), annual_income),
hire_date = COALESCE(VALUES(hire_date), hire_date),
status = COALESCE(VALUES(status), status),
update_by = COALESCE(VALUES(update_by), update_by),
@@ -67,12 +69,12 @@
<!-- 批量插入员工信息 -->
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO ccdi_base_staff
(staff_id, name, dept_id, id_card, phone, hire_date, status,
(staff_id, name, dept_id, id_card, phone, annual_income, hire_date, status,
create_time, create_by, update_by, update_time)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.staffId}, #{item.name}, #{item.deptId}, #{item.idCard},
#{item.phone}, #{item.hireDate}, #{item.status}, NOW(),
#{item.phone}, #{item.annualIncome}, #{item.hireDate}, #{item.status}, NOW(),
#{item.createBy}, #{item.updateBy}, NOW())
</foreach>
</insert>

11
ccdi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffFmyRelationMapper.xml
View File

@@ -17,6 +17,7 @@
<result property="relationCertNo" column="relation_cert_no"/>
<result property="mobilePhone1" column="mobile_phone1"/>
<result property="mobilePhone2" column="mobile_phone2"/>
<result property="annualIncome" column="annual_income"/>
<result property="wechatNo1" column="wechat_no1"/>
<result property="wechatNo2" column="wechat_no2"/>
<result property="wechatNo3" column="wechat_no3"/>
@@ -40,7 +41,7 @@
SELECT
r.id, r.person_id, s.name as person_name, r.relation_type, r.relation_name,
r.gender, r.birth_date, r.relation_cert_type, r.relation_cert_no,
r.mobile_phone1, r.mobile_phone2, r.wechat_no1, r.wechat_no2, r.wechat_no3,
r.mobile_phone1, r.mobile_phone2, r.annual_income, r.wechat_no1, r.wechat_no2, r.wechat_no3,
r.contact_address, r.relation_desc, r.effective_date, r.invalid_date,
r.status, r.remark, r.data_source, r.is_emp_family, r.is_cust_family,
r.created_by, r.create_time, r.updated_by, r.update_time
@@ -80,7 +81,7 @@
SELECT
r.id, r.person_id, s.name as person_name, r.relation_type, r.relation_name,
r.gender, r.birth_date, r.relation_cert_type, r.relation_cert_no,
r.mobile_phone1, r.mobile_phone2, r.wechat_no1, r.wechat_no2, r.wechat_no3,
r.mobile_phone1, r.mobile_phone2, r.annual_income, r.wechat_no1, r.wechat_no2, r.wechat_no3,
r.contact_address, r.relation_desc, r.effective_date, r.invalid_date,
r.status, r.remark, r.data_source, r.is_emp_family, r.is_cust_family,
r.created_by, r.create_time, r.updated_by, r.update_time
@@ -94,7 +95,7 @@
SELECT
r.id, r.person_id, s.name as person_name, r.relation_type, r.relation_name,
r.gender, r.birth_date, r.relation_cert_type, r.relation_cert_no,
r.mobile_phone1, r.mobile_phone2, r.wechat_no1, r.wechat_no2, r.wechat_no3,
r.mobile_phone1, r.mobile_phone2, r.annual_income, r.wechat_no1, r.wechat_no2, r.wechat_no3,
r.contact_address, r.relation_desc, r.effective_date, r.invalid_date,
r.status, r.remark, r.data_source, r.is_emp_family, r.is_cust_family,
r.created_by, r.create_time, r.updated_by, r.update_time
@@ -133,14 +134,14 @@
<insert id="insertBatch">
INSERT INTO ccdi_staff_fmy_relation
(person_id, relation_type, relation_name, gender, birth_date, relation_cert_type, relation_cert_no,
mobile_phone1, mobile_phone2, wechat_no1, wechat_no2, wechat_no3, contact_address, relation_desc,
mobile_phone1, mobile_phone2, annual_income, wechat_no1, wechat_no2, wechat_no3, contact_address, relation_desc,
effective_date, invalid_date, status, remark, data_source, is_emp_family, is_cust_family,
created_by, create_time, updated_by, update_time)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.personId}, #{item.relationType}, #{item.relationName}, #{item.gender},
#{item.birthDate}, #{item.relationCertType}, #{item.relationCertNo}, #{item.mobilePhone1},
#{item.mobilePhone2}, #{item.wechatNo1}, #{item.wechatNo2}, #{item.wechatNo3}, #{item.contactAddress},
#{item.mobilePhone2}, #{item.annualIncome}, #{item.wechatNo1}, #{item.wechatNo2}, #{item.wechatNo3}, #{item.contactAddress},
#{item.relationDesc}, #{item.effectiveDate}, #{item.invalidDate}, #{item.status}, #{item.remark},
#{item.dataSource}, #{item.isEmpFamily}, #{item.isCustFamily}, #{item.createdBy}, NOW(), #{item.updatedBy}, NOW())
</foreach>