huyc 项目档案代码提交

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

@@ -20,10 +20,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.plugin.excel.vo.ErrorMessage;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpChangeInfo;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpChangeInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TCustomerInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService;
@@ -57,6 +54,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 
 	private final TSettleDomainService tSettleDomainService;
 
+	private final TEmployeeLogServiceImpl tEmployeeLogService;
+
 	/**
 	 * @Author huyc
 	 * @Description  档案划转
@@ -90,6 +89,10 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 		}
 		//保存档案划转记录
 		this.save(tEmpChangeInfo);
+
+		// 记录变更日志
+		TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(tEmpChangeInfo.getProId());
+		tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", updateTEmployeeProject.getId(), tEmployeeProjectOld, updateTEmployeeProject);
 		return R.ok();
 	}
 
@@ -139,6 +142,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 							updateTEmployeePro.setUnitName(tCustomerInfo.getCustomerName());
 						}
 						tEmployeeProjectService.updateById(updateTEmployeePro);
+						// 记录变更日志
+						TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(updateTEmployeePro.getId());
+						tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProjectOld.getId(), tEmployeeProjectOld, updateTEmployeePro);
 					}
 				}
 			} else {

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

@@ -632,7 +632,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		proupdateList.add(tEmployeeProject);
 		// 记录变更日志
 		TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
-		tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], tEmployeeProject.getId(), "", tEmployeeProjectOld, tEmployeeProject);
+		tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProject.getId(), tEmployeeProjectOld, tEmployeeProject);
 	}
 
 	@Override