优化修改

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeLogService.java

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeLog;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 
 /**
@@ -56,6 +57,19 @@ public interface TEmployeeLogService extends IService<TEmployeeLog> {
 	 **/
 	<T> TEmployeeLog saveModificationRecord(Integer type, String empId, String projectId, T oldInfo, T newInfo, YifuUser user);
 
+	/**
+	 * 生成修改记录
+	 * @Author pwang
+	 * @Date 2022-06-22 11:32
+	 * @param type 类型：0人员档案；1项目档案；2人员和项目档案；3员工合同更新
+	 * @param empId 档案id
+	 * @param projectId 项目id
+	 * @param oldInfo
+	 * @param newInfo
+	 * @return
+	 **/
+	<T> TEmployeeLog saveModificationRecord(Integer type, String empId, String projectId, T oldInfo, T newInfo, UpProjectSocialFundVo vo);
+
 	/**
 	 * 生成修改记录
 	 * @Author pwang

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeLogServiceImpl.java

@@ -23,6 +23,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeLog;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeLogMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
@@ -95,6 +96,35 @@ public class TEmployeeLogServiceImpl extends ServiceImpl<TEmployeeLogMapper, TEm
 		return null;
 	}
 
+	@Override
+	public <T> TEmployeeLog saveModificationRecord(Integer type, String empId, String projectId, T oldInfo, T newInfo, UpProjectSocialFundVo vo) {
+		try{
+			//比较记录不影响业务逻辑，用try套住
+			//比较差异
+			String differenceKey = HrEquator.comparisonValue(oldInfo, newInfo);
+			//如果有差异保存差异
+			if(!Common.isEmpty(differenceKey)){
+				TEmployeeLog employeeLog = new TEmployeeLog();
+				employeeLog.setProjectId(projectId);
+				employeeLog.setType(type);
+				employeeLog.setEmpId(empId);
+				employeeLog.setCreateTime(LocalDateTime.now());
+				if (Common.isNotNull(vo)) {
+					employeeLog.setCreateBy(vo.getUserId());
+					employeeLog.setCreateName(vo.getUserName());
+				}
+				employeeLog.setOldInfo(JSON.toJSONString(oldInfo,features));
+				employeeLog.setNewInfo(JSON.toJSONString(newInfo,features));
+				employeeLog.setDifferenceInfo(differenceKey);
+				baseMapper.insert(employeeLog);
+				return employeeLog;
+			}
+		}catch (Exception e){
+			log.error(JSON.toJSON(oldInfo)+"插入修改记录报错>>>",e);
+		}
+		return null;
+	}
+
 	@Override
 	public <T> TEmployeeLog saveModificationRecord(Integer type, String empId, String projectId, T oldInfo, T newInfo, FddContractAttachInfo fddContractAttachInfo) {
 		try{

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -1491,7 +1491,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					failueInfo.append("存在社保/公积金，无法减项");
 				}
 				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "",
-						tEmployeeProject.getId(), tEmployeeProjectOld, tEmployeeProject);
+						tEmployeeProject.getId(), tEmployeeProjectOld, tEmployeeProject,vo);
 				baseMapper.updateById(tEmployeeProject);
 				//如果项目档案已减项，如果人员存在多个项目不处理，反之则减档
 				TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
@@ -1527,7 +1527,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 						}
 					}
 					tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(),
-							"", tEmployeeInfoOld, tEmployeeInfo);
+							"", tEmployeeInfoOld, tEmployeeInfo,vo);
 					tEmployeeInfoMapper.updateById(tEmployeeInfo);
 				}
 			}