Commit 299b9b7b authored by fangxinjiang's avatar fangxinjiang

项目档案无岗位更新岗位

parent fd26ba2b
...@@ -197,4 +197,10 @@ public class EmpProjectDispatchVo implements Serializable { ...@@ -197,4 +197,10 @@ public class EmpProjectDispatchVo implements Serializable {
*/ */
@Schema(description ="试用期(单位月)") @Schema(description ="试用期(单位月)")
private String tryPeriod; private String tryPeriod;
/**
* 是否更新岗位信息
*/
@Schema(description ="是否更新岗位信息")
private Boolean postUpdate;
} }
...@@ -116,4 +116,6 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> { ...@@ -116,4 +116,6 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
int updateChangeById(@Param("project")TEmployeeProject project); int updateChangeById(@Param("project")TEmployeeProject project);
void updateContractStatus(@Param("empId") String empId, @Param("deptId") String deptId, @Param("status")int status); void updateContractStatus(@Param("empId") String empId, @Param("deptId") String deptId, @Param("status")int status);
int updatePostByEmpDeptNo(@Param("deptNo")String deptNo, @Param("post")String post);
} }
...@@ -261,4 +261,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -261,4 +261,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
void updateChangeById(TEmployeeProject oldEmpProject); void updateChangeById(TEmployeeProject oldEmpProject);
void updateContractStatus(String empId, String deptId, int status); void updateContractStatus(String empId, String deptId, int status);
void updatePostByEmpDeptNo(String deptNo, String post);
} }
...@@ -2429,6 +2429,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2429,6 +2429,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
EmpAddDispatchVo emp; EmpAddDispatchVo emp;
for (Map.Entry<String, EmpProjectDispatchVo> entry : projectsMap.entrySet()) { for (Map.Entry<String, EmpProjectDispatchVo> entry : projectsMap.entrySet()) {
projectAdd = entry.getValue(); projectAdd = entry.getValue();
if (Common.isNotNull(projectAdd.getPostUpdate()) && projectAdd.getPostUpdate()){
tEmployeeProjectService.updatePostByEmpDeptNo(projectAdd.getDeptNo(),projectAdd.getPost());
continue;
}
try { try {
if (Common.isNotNull(projectAdd)) { if (Common.isNotNull(projectAdd)) {
project = new TEmployeeProject(); project = new TEmployeeProject();
......
...@@ -1861,6 +1861,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1861,6 +1861,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
baseMapper.updateContractStatus(empId,deptId,status); baseMapper.updateContractStatus(empId,deptId,status);
} }
@Override
public void updatePostByEmpDeptNo(String deptNo, String post) {
baseMapper.updatePostByEmpDeptNo(deptNo,post);
}
/** /**
* @param tEmployeeContractInfo * @param tEmployeeContractInfo
* @Description: 保存审核操作记录 * @Description: 保存审核操作记录
......
...@@ -1067,4 +1067,9 @@ ...@@ -1067,4 +1067,9 @@
set CONTRACT_STATUS = #{status} set CONTRACT_STATUS = #{status}
WHERE a.EMP_ID=#{empId} and a.DEPT_ID=#{deptId} WHERE a.EMP_ID=#{empId} and a.DEPT_ID=#{deptId}
</update> </update>
<update id="updatePostByEmpDeptNo" >
update t_employee_project a
set POST = #{psot}
WHERE a.DEPT_NO=#{deptNo}
</update>
</mapper> </mapper>
...@@ -1594,7 +1594,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1594,7 +1594,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& Common.isNotNull(empVo.getDeptNo()) && Common.isNotNull(empVo.getDeptNo())
&& Common.isEmpty(empVo.getContractType())) { && 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.setPostUpdate(true);
projects.put(excel.getEmpIdcard()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainCode(),project);
}
// 初始化合同 // 初始化合同
initContractInfo(contracts, excel, empVo, setInfoVo, user); initContractInfo(contracts, excel, empVo, setInfoVo, user);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment