Commit af67cc6d authored by hongguangwu's avatar hongguangwu

1.5.7-划转,减项的可划转——项目的合同状态

parent 7a7f2fb3
......@@ -115,5 +115,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
int updateChangeById(@Param("project")TEmployeeProject project);
void updateContractStatus(@Param("empId") String empId, @Param("status")int status);
void updateContractStatus(@Param("empId") String empId, @Param("deptId") String deptId, @Param("status")int status);
}
......@@ -260,5 +260,5 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
void updateChangeById(TEmployeeProject oldEmpProject);
void updateContractStatus(String empId, int status);
void updateContractStatus(String empId, String deptId, int status);
}
......@@ -2256,7 +2256,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contractAudit.setRemark(vo.getRemarkTemp());
contractAudit.setRootName("合同审核");
contractServicer.updateInUseStatusById(c.getEmpId(),c.getDeptNo(),c.getId());
tEmployeeProjectService.updateContractStatus(c.getEmpId(),CommonConstants.ONE_INT);
tEmployeeProjectService.updateContractStatus(c.getEmpId(), c.getSettleDomain(), CommonConstants.ONE_INT);
baseMapper.updateContractStatus(c.getEmpId(),CommonConstants.ONE_INT);
//审核不同
}else if (CommonConstants.ONE_STRING.equals(vo.getType())){
......
......@@ -1848,8 +1848,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
@Override
public void updateContractStatus(String empId, int status) {
baseMapper.updateContractStatus(empId,status);
public void updateContractStatus(String empId, String deptId, int status) {
baseMapper.updateContractStatus(empId,deptId,status);
}
/**
......
......@@ -1064,6 +1064,6 @@
<update id="updateContractStatus" >
update t_employee_project a
set CONTRACT_STATUS = #{status}
WHERE a.EMP_ID=#{empId}
WHERE a.EMP_ID=#{empId} and a.DEPT_ID=#{deptId}
</update>
</mapper>
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