Merge remote-tracking branch 'origin/MVP1.6.3' into MVP1.6.3

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectDispatchVo.java

@@ -197,4 +197,10 @@ public class EmpProjectDispatchVo implements Serializable {
 	 */
 	@Schema(description ="试用期（单位月）")
 	private String tryPeriod;
+
+	/**
+	 * 是否更新岗位信息
+	 */
+	@Schema(description ="是否更新岗位信息")
+	private Boolean postUpdate;
 }

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

@@ -116,4 +116,6 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
     int updateChangeById(@Param("project")TEmployeeProject project);
 
 	void updateContractStatus(@Param("empId") String empId, @Param("deptId") String deptId, @Param("status")int status);
+
+    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;
@@ -261,4 +260,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
     void updateChangeById(TEmployeeProject oldEmpProject);
 
     void updateContractStatus(String empId, String deptId, int status);
+
+    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

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

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

@@ -1861,6 +1861,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		baseMapper.updateContractStatus(empId,deptId,status);
 	}
 
+	@Override
+	public void updatePostByEmpDeptNo(String deptNo, String post, String empIdcard) {
+		baseMapper.updatePostByEmpDeptNo(deptNo,post,empIdcard);
+	}
+
 	/**
 	 * @param tEmployeeContractInfo
 	 * @Description: 保存审核操作记录

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

@@ -1067,4 +1067,9 @@
 		set CONTRACT_STATUS = #{status}
 		WHERE a.EMP_ID=#{empId} and a.DEPT_ID=#{deptId}
 	</update>
+	<update id="updatePostByEmpDeptNo" >
+		update t_employee_project a
+		set POST = #{psot}
+		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

@@ -1594,7 +1594,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				&& Common.isNotNull(empVo.getDeptNo())
 				&& Common.isEmpty(empVo.getContractType())) {
 
-
+			if (Common.isEmpty(empVo.getPost()) && Common.isNotNull(excel.getPost())){
+				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);
+			}
 			// 初始化合同
 			initContractInfo(contracts, excel, empVo, setInfoVo, user);
 		}