人员信息添加年龄和工龄

src/main/java/cn/lihongjie/coal/common/IdCardUtils.java

@@ -0,0 +1,608 @@
+package cn.lihongjie.coal.common;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 身份证工具类
+ *
+
+ */
+public class IdCardUtils {
+
+    /** 中国公民身份证号码最小长度。 */
+    public static final int CHINA_ID_MIN_LENGTH = 15;
+
+    /** 中国公民身份证号码最大长度。 */
+    public static final int CHINA_ID_MAX_LENGTH = 18;
+
+    /** 省、直辖市代码表 */
+    public static final String[] cityCode = {
+            "11", "12", "13", "14", "15", "21", "22", "23", "31", "32", "33", "34", "35", "36", "37", "41",
+            "42", "43", "44", "45", "46", "50", "51", "52", "53", "54", "61", "62", "63", "64", "65", "71",
+            "81", "82", "91"
+    };
+
+    /** 每位加权因子 */
+    public static final int[] power = {
+            7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2
+    };
+
+    /** 第18位校检码 */
+    public static final String[] verifyCode = {
+            "1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"
+    };
+    /** 最低年限 */
+    public static final int MIN = 1930;
+    public static Map<String, String> cityCodes = new HashMap<String, String>();
+    /** 台湾身份首字母对应数字 */
+    public static Map<String, Integer> twFirstCode = new HashMap<String, Integer>();
+    /** 香港身份首字母对应数字 */
+    public static Map<String, Integer> hkFirstCode = new HashMap<String, Integer>();
+    static {
+        cityCodes.put("11", "北京");
+        cityCodes.put("12", "天津");
+        cityCodes.put("13", "河北");
+        cityCodes.put("14", "山西");
+        cityCodes.put("15", "内蒙古");
+        cityCodes.put("21", "辽宁");
+        cityCodes.put("22", "吉林");
+        cityCodes.put("23", "黑龙江");
+        cityCodes.put("31", "上海");
+        cityCodes.put("32", "江苏");
+        cityCodes.put("33", "浙江");
+        cityCodes.put("34", "安徽");
+        cityCodes.put("35", "福建");
+        cityCodes.put("36", "江西");
+        cityCodes.put("37", "山东");
+        cityCodes.put("41", "河南");
+        cityCodes.put("42", "湖北");
+        cityCodes.put("43", "湖南");
+        cityCodes.put("44", "广东");
+        cityCodes.put("45", "广西");
+        cityCodes.put("46", "海南");
+        cityCodes.put("50", "重庆");
+        cityCodes.put("51", "四川");
+        cityCodes.put("52", "贵州");
+        cityCodes.put("53", "云南");
+        cityCodes.put("54", "西藏");
+        cityCodes.put("61", "陕西");
+        cityCodes.put("62", "甘肃");
+        cityCodes.put("63", "青海");
+        cityCodes.put("64", "宁夏");
+        cityCodes.put("65", "新疆");
+        cityCodes.put("71", "台湾");
+        cityCodes.put("81", "香港");
+        cityCodes.put("82", "澳门");
+        cityCodes.put("91", "国外");
+        twFirstCode.put("A", 10);
+        twFirstCode.put("B", 11);
+        twFirstCode.put("C", 12);
+        twFirstCode.put("D", 13);
+        twFirstCode.put("E", 14);
+        twFirstCode.put("F", 15);
+        twFirstCode.put("G", 16);
+        twFirstCode.put("H", 17);
+        twFirstCode.put("J", 18);
+        twFirstCode.put("K", 19);
+        twFirstCode.put("L", 20);
+        twFirstCode.put("M", 21);
+        twFirstCode.put("N", 22);
+        twFirstCode.put("P", 23);
+        twFirstCode.put("Q", 24);
+        twFirstCode.put("R", 25);
+        twFirstCode.put("S", 26);
+        twFirstCode.put("T", 27);
+        twFirstCode.put("U", 28);
+        twFirstCode.put("V", 29);
+        twFirstCode.put("X", 30);
+        twFirstCode.put("Y", 31);
+        twFirstCode.put("W", 32);
+        twFirstCode.put("Z", 33);
+        twFirstCode.put("I", 34);
+        twFirstCode.put("O", 35);
+        hkFirstCode.put("A", 1);
+        hkFirstCode.put("B", 2);
+        hkFirstCode.put("C", 3);
+        hkFirstCode.put("R", 18);
+        hkFirstCode.put("U", 21);
+        hkFirstCode.put("Z", 26);
+        hkFirstCode.put("X", 24);
+        hkFirstCode.put("W", 23);
+        hkFirstCode.put("O", 15);
+        hkFirstCode.put("N", 14);
+    }
+
+    /**
+     * 将15位身份证号码转换为18位
+     *
+     * @param idCard
+     *            15位身份编码
+     * @return 18位身份编码
+     */
+    public static String conver15CardTo18(String idCard) {
+        String idCard18 = "";
+        if (idCard.length() != CHINA_ID_MIN_LENGTH) {
+            return null;
+        }
+        if (isNum(idCard)) {
+            // 获取出生年月日
+            String birthday = idCard.substring(6, 12);
+            Date birthDate = null;
+            try {
+                birthDate = new SimpleDateFormat("yyMMdd").parse(birthday);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            Calendar cal = Calendar.getInstance();
+            if (birthDate != null)
+                cal.setTime(birthDate);
+            // 获取出生年(完全表现形式,如：2010)
+            String sYear = String.valueOf(cal.get(Calendar.YEAR));
+            idCard18 = idCard.substring(0, 6) + sYear + idCard.substring(8);
+            // 转换字符数组
+            char[] cArr = idCard18.toCharArray();
+            if (cArr != null) {
+                int[] iCard = converCharToInt(cArr);
+                int iSum17 = getPowerSum(iCard);
+                // 获取校验位
+                String sVal = getCheckCode18(iSum17);
+                if (sVal.length() > 0) {
+                    idCard18 += sVal;
+                } else {
+                    return null;
+                }
+            }
+        } else {
+            return null;
+        }
+        return idCard18;
+    }
+
+    /**
+     * 验证身份证是否合法
+     */
+    public static boolean validateCard(String idCard) {
+        String card = idCard.trim();
+        if (validateIdCard18(card)) {
+            return true;
+        }
+        if (validateIdCard15(card)) {
+            return true;
+        }
+        String[] cardval = validateIdCard10(card);
+        if (cardval != null) {
+            return cardval[2].equals("true");
+        }
+        return false;
+    }
+
+    /**
+     * 验证18位身份编码是否合法
+     *
+     * @param idCard 身份编码
+     * @return 是否合法
+     */
+    public static boolean validateIdCard18(String idCard) {
+        boolean bTrue = false;
+        if (idCard.length() == CHINA_ID_MAX_LENGTH) {
+            // 前17位
+            String code17 = idCard.substring(0, 17);
+            // 第18位
+            String code18 = idCard.substring(17, CHINA_ID_MAX_LENGTH);
+            if (isNum(code17)) {
+                char[] cArr = code17.toCharArray();
+                if (cArr != null) {
+                    int[] iCard = converCharToInt(cArr);
+                    int iSum17 = getPowerSum(iCard);
+                    // 获取校验位
+                    String val = getCheckCode18(iSum17);
+                    if (val.length() > 0) {
+                        if (val.equalsIgnoreCase(code18)) {
+                            bTrue = true;
+                        }
+                    }
+                }
+            }
+        }
+        return bTrue;
+    }
+
+    /**
+     * 验证15位身份编码是否合法
+     *
+     * @param idCard
+     *            身份编码
+     * @return 是否合法
+     */
+    public static boolean validateIdCard15(String idCard) {
+        if (idCard.length() != CHINA_ID_MIN_LENGTH) {
+            return false;
+        }
+        if (isNum(idCard)) {
+            String proCode = idCard.substring(0, 2);
+            if (cityCodes.get(proCode) == null) {
+                return false;
+            }
+            String birthCode = idCard.substring(6, 12);
+            Date birthDate = null;
+            try {
+                birthDate = new SimpleDateFormat("yy").parse(birthCode.substring(0, 2));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            Calendar cal = Calendar.getInstance();
+            if (birthDate != null)
+                cal.setTime(birthDate);
+            return valiDate(cal.get(Calendar.YEAR), Integer.valueOf(birthCode.substring(2, 4)),
+                    Integer.valueOf(birthCode.substring(4, 6)));
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 验证10位身份编码是否合法
+     *
+     * @param idCard 身份编码
+     * @return 身份证信息数组
+     *         <p>
+     *         [0] - 台湾、澳门、香港 [1] - 性别(男M,女F,未知N) [2] - 是否合法(合法true,不合法false)
+     *         若不是身份证件号码则返回null
+     *         </p>
+     */
+    public static String[] validateIdCard10(String idCard) {
+        String[] info = new String[3];
+        String card = idCard.replaceAll("[\\(|\\)]", "");
+        if (card.length() != 8 && card.length() != 9 && idCard.length() != 10) {
+            return null;
+        }
+        if (idCard.matches("^[a-zA-Z][0-9]{9}$")) { // 台湾
+            info[0] = "台湾";
+            String char2 = idCard.substring(1, 2);
+            if (char2.equals("1")) {
+                info[1] = "M";
+            } else if (char2.equals("2")) {
+                info[1] = "F";
+            } else {
+                info[1] = "N";
+                info[2] = "false";
+                return info;
+            }
+            info[2] = validateTWCard(idCard) ? "true" : "false";
+        } else if (idCard.matches("^[1|5|7][0-9]{6}\\(?[0-9A-Z]\\)?$")) { // 澳门
+            info[0] = "澳门";
+            info[1] = "N";
+            // TODO
+        } else if (idCard.matches("^[A-Z]{1,2}[0-9]{6}\\(?[0-9A]\\)?$")) { // 香港
+            info[0] = "香港";
+            info[1] = "N";
+            info[2] = validateHKCard(idCard) ? "true" : "false";
+        } else {
+            return null;
+        }
+        return info;
+    }
+
+    /**
+     * 验证台湾身份证号码
+     *
+     * @param idCard
+     *            身份证号码
+     * @return 验证码是否符合
+     */
+    public static boolean validateTWCard(String idCard) {
+        String start = idCard.substring(0, 1);
+        String mid = idCard.substring(1, 9);
+        String end = idCard.substring(9, 10);
+        Integer iStart = twFirstCode.get(start);
+        Integer sum = iStart / 10 + (iStart % 10) * 9;
+        char[] chars = mid.toCharArray();
+        Integer iflag = 8;
+        for (char c : chars) {
+            sum = sum + Integer.valueOf(c + "") * iflag;
+            iflag--;
+        }
+        return (sum % 10 == 0 ? 0 : (10 - sum % 10)) == Integer.valueOf(end);
+    }
+
+    /**
+     * 验证香港身份证号码(存在Bug，部份特殊身份证无法检查)
+     * <p>
+     * 身份证前2位为英文字符，如果只出现一个英文字符则表示第一位是空格，对应数字58 前2位英文字符A-Z分别对应数字10-35
+     * 最后一位校验码为0-9的数字加上字符"A"，"A"代表10
+     * </p>
+     * <p>
+     * 将身份证号码全部转换为数字，分别对应乘9-1相加的总和，整除11则证件号码有效
+     * </p>
+     *
+     * @param idCard 身份证号码
+     * @return 验证码是否符合
+     */
+    public static boolean validateHKCard(String idCard) {
+        String card = idCard.replaceAll("[\\(|\\)]", "");
+        Integer sum = 0;
+        if (card.length() == 9) {
+            sum = (Integer.valueOf(card.substring(0, 1).toUpperCase().toCharArray()[0]) - 55) * 9
+                  + (Integer.valueOf(card.substring(1, 2).toUpperCase().toCharArray()[0]) - 55) * 8;
+            card = card.substring(1, 9);
+        } else {
+            sum = 522 + (Integer.valueOf(card.substring(0, 1).toUpperCase().toCharArray()[0]) - 55) * 8;
+        }
+        String mid = card.substring(1, 7);
+        String end = card.substring(7, 8);
+        char[] chars = mid.toCharArray();
+        Integer iflag = 7;
+        for (char c : chars) {
+            sum = sum + Integer.valueOf(c + "") * iflag;
+            iflag--;
+        }
+        if (end.equalsIgnoreCase("A")) {
+            sum = sum + 10;
+        } else {
+            sum = sum + Integer.valueOf(end);
+        }
+        return sum % 11 == 0;
+    }
+
+    /**
+     * 将字符数组转换成数字数组
+     *
+     * @param ca
+     *            字符数组
+     * @return 数字数组
+     */
+    public static int[] converCharToInt(char[] ca) {
+        int len = ca.length;
+        int[] iArr = new int[len];
+        try {
+            for (int i = 0; i < len; i++) {
+                iArr[i] = Integer.parseInt(String.valueOf(ca[i]));
+            }
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return iArr;
+    }
+
+    /**
+     * 将身份证的每位和对应位的加权因子相乘之后，再得到和值
+     *
+     * @param iArr
+     * @return 身份证编码。
+     */
+    public static int getPowerSum(int[] iArr) {
+        int iSum = 0;
+        if (power.length == iArr.length) {
+            for (int i = 0; i < iArr.length; i++) {
+                for (int j = 0; j < power.length; j++) {
+                    if (i == j) {
+                        iSum = iSum + iArr[i] * power[j];
+                    }
+                }
+            }
+        }
+        return iSum;
+    }
+
+    /**
+     * 将power和值与11取模获得余数进行校验码判断
+     *
+     * @param iSum
+     * @return 校验位
+     */
+    public static String getCheckCode18(int iSum) {
+        String sCode = "";
+        switch (iSum % 11) {
+            case 10:
+                sCode = "2";
+                break;
+            case 9:
+                sCode = "3";
+                break;
+            case 8:
+                sCode = "4";
+                break;
+            case 7:
+                sCode = "5";
+                break;
+            case 6:
+                sCode = "6";
+                break;
+            case 5:
+                sCode = "7";
+                break;
+            case 4:
+                sCode = "8";
+                break;
+            case 3:
+                sCode = "9";
+                break;
+            case 2:
+                sCode = "x";
+                break;
+            case 1:
+                sCode = "0";
+                break;
+            case 0:
+                sCode = "1";
+                break;
+        }
+        return sCode;
+    }
+
+    /**
+     * 根据身份编号获取年龄
+     *
+     * @param idCard
+     *            身份编号
+     * @return 年龄
+     */
+    public static int getAgeByIdCard(String idCard) {
+        int iAge = 0;
+        if (idCard.length() == CHINA_ID_MIN_LENGTH) {
+            idCard = conver15CardTo18(idCard);
+        }
+        String year = idCard.substring(6, 10);
+        Calendar cal = Calendar.getInstance();
+        int iCurrYear = cal.get(Calendar.YEAR);
+        iAge = iCurrYear - Integer.valueOf(year);
+        return iAge;
+    }
+
+    /**
+     * 根据身份编号获取生日
+     *
+     * @param idCard 身份编号
+     * @return 生日(yyyyMMdd)
+     */
+    public static String getBirthByIdCard(String idCard) {
+        Integer len = idCard.length();
+        if (len < CHINA_ID_MIN_LENGTH) {
+            return null;
+        } else if (len == CHINA_ID_MIN_LENGTH) {
+            idCard = conver15CardTo18(idCard);
+        }
+        return idCard.substring(6, 14);
+    }
+
+    /**
+     * 根据身份编号获取生日年
+     *
+     * @param idCard 身份编号
+     * @return 生日(yyyy)
+     */
+    public static Short getYearByIdCard(String idCard) {
+        Integer len = idCard.length();
+        if (len < CHINA_ID_MIN_LENGTH) {
+            return null;
+        } else if (len == CHINA_ID_MIN_LENGTH) {
+            idCard = conver15CardTo18(idCard);
+        }
+        return Short.valueOf(idCard.substring(6, 10));
+    }
+
+    /**
+     * 根据身份编号获取生日月
+     *
+     * @param idCard
+     *            身份编号
+     * @return 生日(MM)
+     */
+    public static Short getMonthByIdCard(String idCard) {
+        Integer len = idCard.length();
+        if (len < CHINA_ID_MIN_LENGTH) {
+            return null;
+        } else if (len == CHINA_ID_MIN_LENGTH) {
+            idCard = conver15CardTo18(idCard);
+        }
+        return Short.valueOf(idCard.substring(10, 12));
+    }
+
+    /**
+     * 根据身份编号获取生日天
+     *
+     * @param idCard
+     *            身份编号
+     * @return 生日(dd)
+     */
+    public static Short getDateByIdCard(String idCard) {
+        Integer len = idCard.length();
+        if (len < CHINA_ID_MIN_LENGTH) {
+            return null;
+        } else if (len == CHINA_ID_MIN_LENGTH) {
+            idCard = conver15CardTo18(idCard);
+        }
+        return Short.valueOf(idCard.substring(12, 14));
+    }
+
+    /**
+     * 根据身份编号获取性别
+     *
+     * @param idCard 身份编号
+     * @return 性别(M-男，F-女，N-未知)
+     */
+    public static String getGenderByIdCard(String idCard) {
+        String sGender = "N";
+        if (idCard.length() == CHINA_ID_MIN_LENGTH) {
+            idCard = conver15CardTo18(idCard);
+        }
+        String sCardNum = idCard.substring(16, 17);
+        if (Integer.parseInt(sCardNum) % 2 != 0) {
+            sGender = "M";
+        } else {
+            sGender = "F";
+        }
+        return sGender;
+    }
+
+    /**
+     * 根据身份编号获取户籍省份
+     *
+     * @param idCard 身份编码
+     * @return 省级编码。
+     */
+    public static String getProvinceByIdCard(String idCard) {
+        int len = idCard.length();
+        String sProvince = null;
+        String sProvinNum = "";
+        if (len == CHINA_ID_MIN_LENGTH || len == CHINA_ID_MAX_LENGTH) {
+            sProvinNum = idCard.substring(0, 2);
+        }
+        sProvince = cityCodes.get(sProvinNum);
+        return sProvince;
+    }
+
+    /**
+     * 数字验证
+     *
+     * @param val
+     * @return 提取的数字。
+     */
+    public static boolean isNum(String val) {
+        return val != null && !"".equals(val) && val.matches("^[0-9]*$");
+    }
+
+    /**
+     * 验证小于当前日期 是否有效
+     *
+     * @param iYear
+     *            待验证日期(年)
+     * @param iMonth
+     *            待验证日期(月 1-12)
+     * @param iDate
+     *            待验证日期(日)
+     * @return 是否有效
+     */
+    public static boolean valiDate(int iYear, int iMonth, int iDate) {
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        int datePerMonth;
+        if (iYear < MIN || iYear >= year) {
+            return false;
+        }
+        if (iMonth < 1 || iMonth > 12) {
+            return false;
+        }
+        switch (iMonth) {
+            case 4:
+            case 6:
+            case 9:
+            case 11:
+                datePerMonth = 30;
+                break;
+            case 2:
+                boolean dm = ((iYear % 4 == 0 && iYear % 100 != 0) || (iYear % 400 == 0))
+                             && (iYear > MIN && iYear < year);
+                datePerMonth = dm ? 29 : 28;
+                break;
+            default:
+                datePerMonth = 31;
+        }
+        return (iDate >= 1) && (iDate <= datePerMonth);
+    }
+}

src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java

@@ -268,6 +268,15 @@ public class EmpSalaryEntity extends OrgCommonEntity {
     @Comment("住房公积金比例")
     private Double insurance6Percent;
 
+    @Comment("工龄")
+    private Double workAge;
+
+    @Comment("年龄")
+    private Double age;
+
+    @Comment("出生日期")
+    private LocalDate birthday;
+
     @Comment("归档状态")
     @ColumnDefault("'0'")
     private String archiveStatus = "0";
@@ -346,6 +355,9 @@ public class EmpSalaryEntity extends OrgCommonEntity {
         this.insurance5Percent = salaryEntity.insurance5Percent;
         this.insurance6Base = salaryEntity.insurance6Base;
         this.insurance6Percent = salaryEntity.insurance6Percent;
+        this.workAge = salaryEntity.workAge;
+        this.age = salaryEntity.age;
+        this.birthday = salaryEntity.birthday;
     }
 
     private void updateItems(EmpSalaryEntity salaryEntity) {

src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java

@@ -45,10 +45,10 @@ public class EmpSalaryBatchEntity extends OrgCommonEntity {
 
         this.setCode(
                 String.format(
-                        "%s%s%s",
+                        "%s%02d%02d",
                         this.getBatchYearMonth().getYear(),
                         this.getBatchYearMonth().getMonthValue(),
-                        this.getBatchNo()));
+                        Integer.parseInt(this.getBatchNo())));
     }
 
     @Override

src/main/java/cn/lihongjie/coal/employee/controller/EmployeeController.java

@@ -5,6 +5,7 @@ import cn.lihongjie.coal.annotation.SysLog;
 import cn.lihongjie.coal.base.dto.CommonQuery;
 import cn.lihongjie.coal.base.dto.IdRequest;
 import cn.lihongjie.coal.common.Base64File;
+import cn.lihongjie.coal.common.Ctx;
 import cn.lihongjie.coal.employee.dto.CreateEmployeeDto;
 import cn.lihongjie.coal.employee.dto.EmployeeDto;
 import cn.lihongjie.coal.employee.dto.ImportEmpFromExcelRequest;
@@ -67,4 +68,11 @@ public class EmployeeController {
 
         return true;
     }
+    @PostMapping("/refreshAge")
+    public Object refreshAge() {
+        this.service.refreshAge(Ctx.currentUser().getOrganizationId());
+
+        return true;
+    }
+
 }

src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java

@@ -160,4 +160,15 @@ public class EmployeeDto extends OrgCommonDto {
     private Double insurance6Base;
     @Comment("住房公积金比例")
     private Double insurance6Percent;
+
+
+    @Comment("工龄")
+    private Double workAge;
+
+
+    @Comment("年龄")
+    private Double age;
+
+    @Comment("出生日期")
+    private LocalDate birthday;
 }

src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java

@@ -1,7 +1,9 @@
 package cn.lihongjie.coal.employee.entity;
 
 import cn.lihongjie.coal.base.entity.OrgCommonEntity;
+import cn.lihongjie.coal.common.IdCardUtils;
 import cn.lihongjie.coal.department.entity.DepartmentEntity;
+import cn.lihongjie.coal.exception.BizException;
 import cn.lihongjie.coal.file.entity.FileEntity;
 import cn.lihongjie.coal.jobPost.entity.JobPostEntity;
 
@@ -9,11 +11,16 @@ import jakarta.persistence.*;
 
 import lombok.Data;
 
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 @Data
@@ -23,36 +30,27 @@ public class EmployeeEntity extends OrgCommonEntity {
     @Comment("性别")
     private String sex;
 
-
-
     @Comment("民族")
     private String nation;
 
-
     @Comment("婚姻状况")
     private String marriage;
 
-
-
     @Comment("入职时间")
     private LocalDate entryDate;
 
-
     @Comment("离职时间")
     private LocalDate resignDate;
 
     @Comment("离职原因")
     private String resignReason;
 
-
     @Comment("身份证号")
     private String idCard;
 
     @Comment("学历")
     private String education;
 
-
-
     @Comment("毕业学校")
     private String school;
 
@@ -89,8 +87,6 @@ public class EmployeeEntity extends OrgCommonEntity {
     @Comment("银行编码")
     private String bank;
 
-
-
     @Comment("银行卡号")
     private String bankCardNumber;
 
@@ -100,21 +96,14 @@ public class EmployeeEntity extends OrgCommonEntity {
     @Comment("员工状态")
     private String empStatus;
 
-
-
-
-
     @ElementCollection
     @Fetch(FetchMode.SUBSELECT)
     private List<EmpFamilyMemberVO> familyMembers;
 
-
     @ElementCollection
     @Fetch(FetchMode.SUBSELECT)
     private List<EmpCertVO> certs;
 
-
-
     @ElementCollection
     @Fetch(FetchMode.SUBSELECT)
     private List<EmpCarVO> cars;
@@ -128,42 +117,126 @@ public class EmployeeEntity extends OrgCommonEntity {
      */
     @Comment("养老保险基数")
     private Double insurance1Base;
+
     @Comment("养老保险比例")
     private Double insurance1Percent;
 
-
     @Comment("医疗保险基数")
     private Double insurance2Base;
+
     @Comment("医疗保险比例")
     private Double insurance2Percent;
 
-
-
     @Comment("失业保险基数")
     private Double insurance3Base;
+
     @Comment("失业保险比例")
     private Double insurance3Percent;
 
-
-
     @Comment("工伤保险基数")
     private Double insurance4Base;
+
     @Comment("工伤保险比例")
     private Double insurance4Percent;
 
-
-
     @Comment("生育保险基数")
     private Double insurance5Base;
+
     @Comment("生育保险比例")
     private Double insurance5Percent;
 
     @Comment("住房公积金基数")
     private Double insurance6Base;
+
     @Comment("住房公积金比例")
     private Double insurance6Percent;
 
+    @Comment("工龄")
+    private Double workAge;
 
+    @Comment("年龄")
+    private Double age;
 
+    @Comment("出生日期")
+    private LocalDate birthday;
 
+    @Override
+    public void prePersist() {
+        super.prePersist();
+
+        updateCommon();
+    }
+
+    private void updateCommon() {
+
+        if (StringUtils.equalsAny(empStatus, "0")) {
+
+            workAge = null;
+
+        } else if (StringUtils.equalsAny(empStatus, "1")) {
+
+            if (this.entryDate == null) {
+                throw new BizException(this.getName() + " 入职时间不能为空");
+            }
+
+            long monthDiff = ChronoUnit.MONTHS.between(LocalDate.now(), entryDate);
+
+            if (monthDiff < 0) {
+                throw new BizException(this.getName() + " 入职时间不能大于当前时间");
+            }
+
+            this.workAge =
+                    BigDecimal.valueOf(monthDiff)
+                            .divide(BigDecimal.valueOf(12), 1, RoundingMode.FLOOR)
+                            .doubleValue();
+
+        } else if (StringUtils.equalsAny(empStatus, "2")) {
+
+            if (this.resignDate == null) {
+                throw new BizException(this.getName() + " 离职时间不能为空");
+            }
+
+            if (this.entryDate == null) {
+                throw new BizException(this.getName() + " 入职时间不能为空");
+            }
+
+            long monthDiff = ChronoUnit.MONTHS.between(entryDate, resignDate);
+
+            if (monthDiff < 0) {
+                throw new BizException(this.getName() + " 离职时间不能小于入职时间");
+            }
+
+            this.workAge =
+                    BigDecimal.valueOf(monthDiff)
+                            .divide(BigDecimal.valueOf(12), 1, RoundingMode.FLOOR)
+                            .doubleValue();
+
+        } else {
+
+            throw new BizException(this.getName() + " 员工状态不合法 " + empStatus);
+        }
+
+        if (StringUtils.isNotEmpty(idCard)) {
+
+            if (IdCardUtils.validateCard(idCard)) {
+
+                this.birthday =
+                        LocalDate.parse(
+                                IdCardUtils.getBirthByIdCard(idCard),
+                                DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+                this.age =
+                        BigDecimal.valueOf(ChronoUnit.YEARS.between(birthday, LocalDate.now()))
+                                .doubleValue();
+            } else {
+                throw new BizException(this.getName() + " 身份证号不合法");
+            }
+        }
+    }
+
+    @Override
+    public void preUpdate() {
+        super.preUpdate();
+        updateCommon();
+    }
 }

src/main/java/cn/lihongjie/coal/employee/repository/EmployeeRepository.java

@@ -12,6 +12,48 @@ import java.util.List;
 @Repository
 public interface EmployeeRepository extends BaseRepository<EmployeeEntity> {
 
-    @Query("select exists(select 1 from EmployeeRecordEntity e where e.employee.id in :ids union all select 1 from EmpMonthAttendanceEntity e where e.employee.id in :ids union all select 1 from EmpSalaryEntity e where e.employee.id in :ids)")
+    @Query(
+            "select exists(select 1 from EmployeeRecordEntity e where e.employee.id in :ids union all select 1 from EmpMonthAttendanceEntity e where e.employee.id in :ids union all select 1 from EmpSalaryEntity e where e.employee.id in :ids)")
     boolean isLinked(@Param("ids") List<String> ids);
+
+    @Query(
+            value =
+                    """
+
+update t_employee e
+
+set work_age = case
+                    when e.emp_status = '0' then null
+                    when e.emp_status = '1' and e.entry_date is not null and e.entry_date::timestamp <= now()
+                        then extract(year from  age(now(), e.entry_date::timestamp)) * 12.0 + round((trunc((extract(month from age(now(), e.entry_date::timestamp)) / 12.0) * 10) / 10.0 )::numeric, 1)
+                    when e.emp_status = '2' and e.entry_date::timestamp is not null and e.entry_date::timestamp <= now() and  e.resign_date is not null and e.resign_date::timestamp > e.entry_date::timestamp
+                        then extract(year from  age(e.resign_date::timestamp, e.entry_date::timestamp)) * 12.0 + round((trunc((extract(month from age(e.resign_date::timestamp, e.entry_date::timestamp)) / 12.0) * 10) / 10.0 )::numeric, 1)
+
+                    else null
+                end
+where e.organization_id = :organizationId
+
+
+
+""",
+            nativeQuery = true)
+    boolean updateWorkAge(@Param("organizationId") String organizationId);
+
+    @Query(
+            value =
+                    """
+
+                    update t_employee e
+
+                    set age = case when e.birthday is not null and e.birthday::timestamp <= now() then
+                        extract(year from age(now(), e.birthday::timestamp))
+                        else null
+                                    end
+                    where e.organization_id = :organizationId
+
+
+
+                    """,
+            nativeQuery = true)
+    boolean updateAge(@Param("organizationId") String organizationId);
 }

src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java

@@ -131,6 +131,8 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
     @Autowired JobPostService jobPostService;
     @PersistenceContext private EntityManager entityManager;
 
+    @PersistenceContext EntityManager em;
+
     public Base64File generateImportTemplate() {
 
         Base64File base64File = new Base64File();
@@ -140,28 +142,37 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
                 null,
                 base64File,
                 ExcelUtils.SheetCustomizer.headerBasedConstrainCustomizer(
-                        name -> {
-                            return switch (name) {
-                                case "入职时间" ->
-                                        new ExcelUtils.ValidationInfo.DateValidationInfo();
-                                case "性别" ->
-                                        new ExcelUtils.ValidationInfo.ListValidationInfo(
-                                                dictionaryService.getExcelValidation("sex"));
-                                case "民族" ->
-                                        new ExcelUtils.ValidationInfo.ListValidationInfo(
-                                                dictionaryService.getExcelValidation("nation"));
-                                case "婚姻状况" ->
-                                        new ExcelUtils.ValidationInfo.ListValidationInfo(
-                                                dictionaryService.getExcelValidation("marriage"));
-                                case "学历" ->
-                                        new ExcelUtils.ValidationInfo.ListValidationInfo(
-                                                dictionaryService.getExcelValidation("education"));
-                                default -> new ExcelUtils.ValidationInfo.AnyValidationInfo();
-                            };
-                        }).andThen(ExcelUtils.SheetCustomizer.autoSizeColumnCustomizer()).andThen(ExcelUtils.SheetCustomizer.centerFirstRowCustomizer()));
+                                name -> {
+                                    return switch (name) {
+                                        case "入职时间" ->
+                                                new ExcelUtils.ValidationInfo.DateValidationInfo();
+                                        case "性别" ->
+                                                new ExcelUtils.ValidationInfo.ListValidationInfo(
+                                                        dictionaryService.getExcelValidation(
+                                                                "sex"));
+                                        case "民族" ->
+                                                new ExcelUtils.ValidationInfo.ListValidationInfo(
+                                                        dictionaryService.getExcelValidation(
+                                                                "nation"));
+                                        case "婚姻状况" ->
+                                                new ExcelUtils.ValidationInfo.ListValidationInfo(
+                                                        dictionaryService.getExcelValidation(
+                                                                "marriage"));
+                                        case "学历" ->
+                                                new ExcelUtils.ValidationInfo.ListValidationInfo(
+                                                        dictionaryService.getExcelValidation(
+                                                                "education"));
+                                        default ->
+                                                new ExcelUtils.ValidationInfo.AnyValidationInfo();
+                                    };
+                                })
+                        .andThen(ExcelUtils.SheetCustomizer.autoSizeColumnCustomizer())
+                        .andThen(ExcelUtils.SheetCustomizer.centerFirstRowCustomizer()));
         return base64File;
     }
 
+    @Autowired PojoProcessor pojoProcessor;
+
     @SneakyThrows
     public void importFromExcel(ImportEmpFromExcelRequest request) {
 
@@ -209,11 +220,16 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
                             switch (header) {
                                 case "姓名" -> emp.setName(ExcelUtils.getString(value));
                                 case "性别" -> emp.setSex(ExcelUtils.getCode(value, sexTranslator));
-                                case "民族" -> emp.setNation(ExcelUtils.getCode(value, nationTranslator));
-                                case "婚姻状况" -> emp.setMarriage(ExcelUtils.getCode(value, marriageTranslator));
+                                case "民族" ->
+                                        emp.setNation(ExcelUtils.getCode(value, nationTranslator));
+                                case "婚姻状况" ->
+                                        emp.setMarriage(
+                                                ExcelUtils.getCode(value, marriageTranslator));
                                 case "入职时间" -> emp.setEntryDate(ExcelUtils.getLocalDate(value));
                                 case "身份证号" -> emp.setIdCard(ExcelUtils.getString(value));
-                                case "学历" -> emp.setEducation(ExcelUtils.getCode(value, educationTranslator));
+                                case "学历" ->
+                                        emp.setEducation(
+                                                ExcelUtils.getCode(value, educationTranslator));
                                 case "毕业学校" -> emp.setSchool(ExcelUtils.getString(value));
                                 case "籍贯" -> emp.setNativePlace(ExcelUtils.getString(value));
                                 case "住址" -> emp.setAddress(ExcelUtils.getString(value));
@@ -222,12 +238,14 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
                                         emp.setDepartment(
                                                 entityManager.getReference(
                                                         DepartmentEntity.class,
-                                                        getDepartmentId.apply(ExcelUtils.getString(value))));
+                                                        getDepartmentId.apply(
+                                                                ExcelUtils.getString(value))));
                                 case "岗位" ->
                                         emp.setJobPost(
                                                 entityManager.getReference(
                                                         JobPostEntity.class,
-                                                        getJobPostId.apply(ExcelUtils.getString(value))));
+                                                        getJobPostId.apply(
+                                                                ExcelUtils.getString(value))));
                                 case "银行卡号" -> emp.setBank(ExcelUtils.getString(value));
                                 case "收款人姓名" -> emp.setBankCardName(ExcelUtils.getString(value));
                             }
@@ -238,15 +256,38 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
         this.repository.saveAll(list);
     }
 
-    @Autowired PojoProcessor pojoProcessor;
-
     public List<EmployeeDto> getDtoByIds(List<String> employeesIds) {
 
-        List<EmployeeDto> collect = this.repository.findAllById(employeesIds).stream().map(this::toDto).collect(Collectors.toList());
-
+        List<EmployeeDto> collect =
+                this.repository.findAllById(employeesIds).stream()
+                        .map(this::toDto)
+                        .collect(Collectors.toList());
 
         pojoProcessor.process(collect, false);
 
         return collect;
     }
+
+    public void refreshAge(String organizationId) {
+
+        // 处理历史遗留数据中有证件号但是没有出生日期的数据
+        List<EmployeeEntity> emps =
+                em.createQuery(
+                                "select e from EmployeeEntity  e where e.idCard is not null and e.idCard != '' and e.birthday is null and e.organizationId = :organizationId",
+                                EmployeeEntity.class)
+                        .setParameter("organizationId", organizationId)
+                        .getResultList();
+
+        if (CollectionUtils.isNotEmpty(emps)) {
+
+            emps.forEach(EmployeeEntity::preUpdate);
+            emps.forEach(x -> em.persist(x));
+        }
+
+        em.flush();
+
+        this.repository.updateWorkAge(organizationId);
+
+        this.repository.updateAge(organizationId);
+    }
 }