项目档案无岗位更新岗位fxj 2024-04-17

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java

@@ -117,5 +117,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
 
 	void updateContractStatus(@Param("empId") String empId, @Param("deptId") String deptId, @Param("status")int status);
 
-    int updatePostByEmpDeptNo(@Param("deptNo")String deptNo, @Param("post")String post);
+    int updatePostByEmpDeptNo(@Param("deptNo")String deptNo, @Param("post")String post,@Param("empIdcard")String empIdcard);
 }

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

@@ -26,7 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import org.apache.ibatis.annotations.Param;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -262,5 +261,5 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 
     void updateContractStatus(String empId, String deptId, int status);
 
-    void updatePostByEmpDeptNo(String deptNo, String post);
+    void updatePostByEmpDeptNo(String deptNo, String post, String empIdcard);
 }

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

@@ -2430,7 +2430,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 			for (Map.Entry<String, EmpProjectDispatchVo> entry : projectsMap.entrySet()) {
 				projectAdd = entry.getValue();
 				if (Common.isNotNull(projectAdd.getPostUpdate()) && projectAdd.getPostUpdate()){
-					tEmployeeProjectService.updatePostByEmpDeptNo(projectAdd.getDeptNo(),projectAdd.getPost());
+					tEmployeeProjectService.updatePostByEmpDeptNo(projectAdd.getDeptNo(),projectAdd.getPost(),projectAdd.getEmpIdcard());
 					continue;
 				}
 				try {

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

@@ -1862,8 +1862,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	}
 
 	@Override
-	public void updatePostByEmpDeptNo(String deptNo, String post) {
-		baseMapper.updatePostByEmpDeptNo(deptNo,post);
+	public void updatePostByEmpDeptNo(String deptNo, String post, String empIdcard) {
+		baseMapper.updatePostByEmpDeptNo(deptNo,post,empIdcard);
 	}
 
 	/**

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -1070,6 +1070,6 @@
 	<update id="updatePostByEmpDeptNo" >
 		update t_employee_project a
 		set POST = #{psot}
-		WHERE a.DEPT_NO=#{deptNo}
+		WHERE a.DEPT_NO=#{deptNo} and a.POST is null and a.EMP_IDCARD=#{empIdcard} and a.DELETE_FLAG ='0'
 	</update>
 </mapper>

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1598,6 +1598,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				EmpProjectDispatchVo project = new EmpProjectDispatchVo();
 				project.setEmpNo(empVo.getDeptNo());
 				project.setPost(excel.getPost());
+				project.setEmpIdcard(empVo.getEmpIdcard());
 				project.setPostUpdate(true);
 				projects.put(excel.getEmpIdcard()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainCode(),project);
 			}