变更记录表修改

src/main/java/com/ydool/common/utils/ColumnUtil.java

@@ -0,0 +1,117 @@
+package com.ydool.common.utils;
+import java.io.Serializable;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.invoke.SerializedLambda;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.function.Function;
+
+/**
+  * Java8通过Function函数获取字段名称(获取实体类的字段名称)
+  * @see
+  * @author jx
+  */
+public class ColumnUtil {
+
+
+    /**
+     * 使Function获取序列化能力
+     */
+    @FunctionalInterface
+    public interface SFunction<T, R> extends Function<T, R>, Serializable {}
+    /**
+     * 字段名注解,声明表字段
+     */
+
+
+    @Target(ElementType.FIELD)
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface TableField {
+        String value() default "";
+    }
+
+ //默认配置
+    static String defaultSplit = "";
+    static Integer defaultToType = 0;
+
+    /**
+   * 获取实体类的字段名称(实体声明的字段名称)
+   */
+    public static <T> String getFieldName(SFunction<T, ?> fn) {
+              return getFieldName(fn, defaultSplit);
+
+    }
+
+    /**
+   * 获取实体类的字段名称
+   * @param split 分隔符，多个字母自定义分隔符
+   */
+    public static <T> String getFieldName(SFunction<T, ?> fn, String split) {
+         return getFieldName(fn, split, defaultToType);
+    }
+
+    /**
+     * 获取实体类的字段名称
+     *
+     * @param split  分隔符，多个字母自定义分隔符
+     * @param toType 转换方式，多个字母以大小写方式返回 0.不做转换 1.大写 2.小写
+     */
+    public static <T> String getFieldName(SFunction<T, ?> fn, String split, Integer toType) {
+        SerializedLambda serializedLambda = getSerializedLambda(fn);
+
+        // 从lambda信息取出method、field、class等
+        String fieldName = serializedLambda.getImplMethodName().substring("get".length());
+        fieldName = fieldName.replaceFirst(fieldName.charAt(0) + "", (fieldName.charAt(0) + "").toLowerCase());
+        Field field;
+        try {
+            field = Class.forName(serializedLambda.getImplClass().replace("/", ".")).getDeclaredField(fieldName);
+        } catch (ClassNotFoundException | NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        }
+
+        // 从field取出字段名，可以根据实际情况调整
+        TableField tableField = field.getAnnotation(TableField.class);
+        if (tableField != null && tableField.value().length() > 0) {
+            return tableField.value();
+        } else {
+
+            //0.不做转换 1.大写 2.小写
+            switch (toType) {
+                case 1:
+                    return fieldName.replaceAll("[A-Z]", split + "$0").toUpperCase();
+                case 2:
+                    return fieldName.replaceAll("[A-Z]", split + "$0").toLowerCase();
+                default:
+                    return fieldName.replaceAll("[A-Z]", split + "$0");
+            }
+
+        }
+
+    }
+
+    private static <T> SerializedLambda getSerializedLambda(SFunction<T, ?> fn) {
+        // 从function取出序列化方法
+        Method writeReplaceMethod;
+        try {
+            writeReplaceMethod = fn.getClass().getDeclaredMethod("writeReplace");
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+
+        // 从序列化方法取出序列化的lambda信息
+        boolean isAccessible = writeReplaceMethod.isAccessible();
+        writeReplaceMethod.setAccessible(true);
+        SerializedLambda serializedLambda;
+        try {
+            serializedLambda = (SerializedLambda) writeReplaceMethod.invoke(fn);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+        writeReplaceMethod.setAccessible(isAccessible);
+        return serializedLambda;
+    }
+}

src/main/java/com/ydool/staff/controller/AlterationController.java

@@ -23,7 +23,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping(UrlConstant.ALTERATION)
-@Api(tags = "人员变更", value = "人员变更")
+@Api(tags = "变更记录", value = "变更记录")
 @ApiSupport(order = 9)
 public class AlterationController extends BaseController {
 

src/main/java/com/ydool/staff/entity/Alteration.java

@@ -27,6 +27,9 @@ public class Alteration extends BaseEntity{
     @ApiModelProperty(value = "关联id")
     private String relevancyId;
 
+    @ApiModelProperty(value = "变更字段名称")
+    private String fieldName;
+
     @ApiModelProperty(value = "变更前")
     private String beforeChange;
 

src/main/java/com/ydool/staff/entity/Personnel.java

@@ -152,4 +152,7 @@ public class Personnel extends BaseEntity {
     @ApiModelProperty(value = "审批状态 0 未审批 1 待审批，2已通过，3已拒绝")
     private Integer auditState;
 
+    @ApiModelProperty(value = "单据状态")
+    private String receipts;
+
 }

src/main/java/com/ydool/staff/entity/SelectRequest.java

@@ -65,8 +65,8 @@ public class SelectRequest {
     @ApiModelProperty(value = "工作状态")
     private String workState;
 
-    @ApiModelProperty(value = "人员招聘单号")
+    @ApiModelProperty(value = "单据状态")
-    private String recruitNumber;
+    private String receipts;
 
     @ApiModelProperty(value = "变更标志")
     private String alterationSign;

src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ydool.staff.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydool.common.base.BaseService;
 import com.ydool.common.constant.AgesConst;
 import com.ydool.common.data.dto.AjaxResult;
+import com.ydool.common.utils.ColumnUtil;
 import com.ydool.staff.dto.AttachmentDto;
 import com.ydool.staff.dto.PersonnelByExchangeDto;
 import com.ydool.staff.dto.PersonnelDto;
@@ -33,6 +35,7 @@ import com.ydool.staff.service.IAttachmentService;
 import com.ydool.staff.service.IPersonnelService;
 import com.ydool.system.entity.Dept;
 import com.ydool.system.mapper.DeptMapper;
+import org.apache.poi.ss.formula.functions.Column;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
@@ -160,17 +163,17 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
             return AjaxResult.fail().msg("该人员修改的资料未审批完成，请联系管理员！");
         }
         String type =AgesConst.PERSONNEL;
-        saveAlteration("民族更改",per.getNation(),updateRequest.getNation(),type,updateRequest.getId());
+        saveAlteration("民族更改",per.getNation(),updateRequest.getNation(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getNation));
-        saveAlteration("政治面貌更改",per.getPoliticsStatus(),updateRequest.getPoliticsStatus(),type,updateRequest.getId());
+        saveAlteration("政治面貌更改",per.getPoliticsStatus(),updateRequest.getPoliticsStatus(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getPoliticsStatus));
-        saveAlteration("学历更改",per.getEducation(),updateRequest.getEducation(),type,updateRequest.getId());
+        saveAlteration("学历更改",per.getEducation(),updateRequest.getEducation(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getEducation));
-        saveAlteration("是否应届毕业生更改",per.getFreshGraduate(),updateRequest.getFreshGraduate(),type,updateRequest.getId());
+        saveAlteration("是否应届毕业生更改",per.getFreshGraduate(),updateRequest.getFreshGraduate(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getFreshGraduate));
-        saveAlteration("毕业院校更改",per.getAcademy(),updateRequest.getAcademy(),type,updateRequest.getId());
+        saveAlteration("毕业院校更改",per.getAcademy(),updateRequest.getAcademy(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getAcademy));
-        saveAlteration("专业更改",per.getSpecialty(),updateRequest.getSpecialty(),type,updateRequest.getId());
+        saveAlteration("专业更改",per.getSpecialty(),updateRequest.getSpecialty(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getSpecialty));
-        saveAlteration("所在部门更改",per.getPresentDept(),updateRequest.getPresentDept(),type,updateRequest.getId());
+        saveAlteration("所在部门更改",per.getPresentDept(),updateRequest.getPresentDept(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getPresentDept));
-        saveAlteration("合同形式更改",per.getContractModality(),updateRequest.getContractModality(),type,updateRequest.getId());
+        saveAlteration("合同形式更改",per.getContractModality(),updateRequest.getContractModality(),type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getContractModality));
-        saveAlteration("身份证附件更改",per.getCardFile(),card,type,updateRequest.getId());
+        saveAlteration("身份证附件更改",per.getCardFile(),card,type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getCardFile));
-        saveAlteration("学历证书附件更改",per.getEducationFile(),education,type,updateRequest.getId());
+        saveAlteration("学历证书附件更改",per.getEducationFile(),education,type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getEducationFile));
-        saveAlteration("审批资料附件更改",per.getAuditFile(),audit,type,updateRequest.getId());
+        saveAlteration("审批资料附件更改",per.getAuditFile(),audit,type,updateRequest.getId(),ColumnUtil.getFieldName(Personnel::getAuditFile));
 
         per.setAuditState(0);
         boolean update = updateById(per);
@@ -197,20 +200,20 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
         String engage = StringUtils.join(saveFilePath(engageFiles,AgesConst.ENGAGE_FILE,type,request.getId()),',');
         String education = StringUtils.join(saveFilePath(educationFiles,AgesConst.EDUCATION_FILE,type,request.getId()),',');
         String audit = StringUtils.join(saveFilePath(auditFiles,AgesConst.AUDIT_FILE,type,request.getId()),',');
-        saveAlteration("录用方式更改",per.getHireType(),request.getHireType(),type,request.getId());
+        saveAlteration("录用方式更改",per.getHireType(),request.getHireType(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getHireType));
-        saveAlteration("执业资格更改",per.getQualification(),request.getQualification(),type,request.getId());
+        saveAlteration("执业资格更改",per.getQualification(),request.getQualification(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getQualification));
-        saveAlteration("专业技术职称更改",per.getJobTitle(),request.getJobTitle(),type,request.getId());
+        saveAlteration("专业技术职称更改",per.getJobTitle(),request.getJobTitle(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getJobTitle));
-        saveAlteration("岗位职务更改",per.getPosition(),request.getPosition(),type,request.getId());
+        saveAlteration("岗位职务更改",per.getPosition(),request.getPosition(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getPosition));
-        saveAlteration("工作状态更改",per.getWorkState(),request.getWorkState(),type,request.getId());
+        saveAlteration("工作状态更改",per.getWorkState(),request.getWorkState(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getWorkState));
-        saveAlteration("人员性质更改",per.getPersonnelCharacter(),request.getPersonnelCharacter(),type,request.getId());
+        saveAlteration("人员性质更改",per.getPersonnelCharacter(),request.getPersonnelCharacter(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getPersonnelCharacter));
-        saveAlteration("年薪更改",per.getAnnualSalary(),request.getAnnualSalary(),type,request.getId());
+        saveAlteration("年薪更改",per.getAnnualSalary(),request.getAnnualSalary(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getAnnualSalary));
-        saveAlteration("退休时间更改",per.getRetirementTime(),request.getRetirementTime(),type,request.getId());
+        saveAlteration("退休时间更改",per.getRetirementTime(),request.getRetirementTime(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getRetirementTime));
-        saveAlteration("人员招聘单号更改",per.getRecruitNumber(),request.getRecruitNumber(),type,request.getId());
+        saveAlteration("人员招聘单号更改",per.getRecruitNumber(),request.getRecruitNumber(),type,request.getId(),ColumnUtil.getFieldName(Personnel::getRecruitNumber));
-        saveAlteration("身份证附件更改",per.getCardFile(),card,type,request.getId());
+        saveAlteration("身份证附件更改",per.getCardFile(),card,type,request.getId(),ColumnUtil.getFieldName(Personnel::getCardFile));
-        saveAlteration("聘任证书附件更改",per.getEngageFile(),jobTitle,type,request.getId());
+        saveAlteration("聘任证书附件更改",per.getEngageFile(),jobTitle,type,request.getId(),ColumnUtil.getFieldName(Personnel::getEngageFile));
-        saveAlteration("职称证书附件更改",per.getJobTitleFile(),engage,type,request.getId());
+        saveAlteration("职称证书附件更改",per.getJobTitleFile(),engage,type,request.getId(),ColumnUtil.getFieldName(Personnel::getJobTitleFile));
-        saveAlteration("学历证书附件更改",per.getEducationFile(),education,type,request.getId());
+        saveAlteration("学历证书附件更改",per.getEducationFile(),education,type,request.getId(),ColumnUtil.getFieldName(Personnel::getEducationFile));
-        saveAlteration("审批资料附件更改",per.getAuditFile(),audit,type,request.getId());
+        saveAlteration("审批资料附件更改",per.getAuditFile(),audit,type,request.getId(),ColumnUtil.getFieldName(Personnel::getAuditFile));
         per.setAuditState(0);
         boolean update = updateById(per);
         saveAttachment(cardFiles,AgesConst.CARD_FILE,request.getId(),AgesConst.UPDATE);
@@ -266,10 +269,11 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
         return new ArrayList<>();
     }
 
-    public void saveAlteration(String details,Object before ,Object after,String type, String id){
+    public void saveAlteration(String details,Object before ,Object after,String type, String id,String fieldName){
         if (!before.equals(after)){
             Alteration alteration = new Alteration();
             alteration.setDetails(details);
+            alteration.setFieldName(fieldName);
             alteration.setType(type);
             alteration.setRelevancyId(id);
             if (ObjectUtil.isNotNull(before)){
@@ -314,7 +318,7 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
                 .eq(ObjectUtil.isNotNull(request.getHireDate()),Personnel::getHireDate,request.getHireDate())
                 .eq(ObjectUtil.isNotNull(request.getResignationTime()),Personnel::getResignationTime,request.getResignationTime())
                 .eq(StrUtil.isNotBlank(request.getWorkState()),Personnel::getWorkState,request.getWorkState())
-                .eq(StrUtil.isNotBlank(request.getRecruitNumber()),Personnel::getRecruitNumber,request.getRecruitNumber())
+                .eq(StrUtil.isNotBlank(request.getReceipts()),Personnel::getRecruitNumber,request.getReceipts())
                 .eq(StrUtil.isNotBlank(request.getAlterationSign()),Personnel::getAlterationSign,request.getAlterationSign());
         wrapper.lambda().like(Personnel::getUserName,request.getUserName())
                 .like(Personnel::getNumberId,request.getNumberId())