huyc 项目档案代码提交

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpChangeInfo.java

@@ -78,7 +78,7 @@ public class TEmpChangeInfo extends BaseEntity {
      * 项目档案id
      */
     @Schema(description ="项目档案id")
-    private Long proId;
+    private String proId;
 
     /**
      * 未结算费用 0：划转 1：不划转

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

@@ -20,15 +20,9 @@ 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;
-import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
-import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
+import com.yifu.cloud.plus.v1.yifu.archives.service.*;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
@@ -80,7 +74,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 		//社保预估库、缴费库、对比库、代理差额库，需要同步修改未结算（并且满足这个条件：数据 生成月≥此处划转起始月）的数据，已结算数据不变更；
 
 		//划转,更新项目信息
-		TEmployeeProject updateTEmployeeProject = tEmployeeProjectService.getById(tEmpChangeInfo.getProId());
+		TEmployeeProject updateTEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query().lambda()
+				.eq(TEmployeeProject::getEmpIdcard, tEmpChangeInfo.getEmpIdcard()).eq(TEmployeeProject::getDeptName,tEmpChangeInfo.getOldSettle())
+				.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL));
 		if (Common.isNotNull(updateTEmployeeProject)) {
 			updateTEmployeeProject.setDeptNo(tEmpChangeInfo.getDeptNo());
 			updateTEmployeeProject.setDeptId(tEmpChangeInfo.getDeptId());
@@ -89,6 +85,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			updateTEmployeeProject.setUnitNo(tEmpChangeInfo.getUnitNo());
 			updateTEmployeeProject.setUnitName(tEmpChangeInfo.getNewDept());
 			tEmployeeProjectService.updateById(updateTEmployeeProject);
+			tEmpChangeInfo.setProId(updateTEmployeeProject.getId());
 		}
 		//保存档案划转记录
 		this.save(tEmpChangeInfo);