|
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.persagy.fm.common.constant.PageQueryConstants;
|
|
|
import com.persagy.fm.common.constant.enums.ValidEnum;
|
|
|
import com.persagy.fm.common.context.DefaultAppContext;
|
|
|
import com.persagy.fm.common.response.FmResponseContent;
|
|
@@ -16,10 +15,10 @@ import com.persagy.fm.person.model.dto.*;
|
|
|
import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
|
|
|
import com.persagy.fm.person.service.IPersonService;
|
|
|
import com.persagy.fm.saas.account.client.SaasAccountClient;
|
|
|
-import com.persagy.fm.saas.account.constant.enums.AccountBelongEnum;
|
|
|
import com.persagy.fm.saas.account.constant.enums.AccountTypeEnum;
|
|
|
import com.persagy.fm.saas.account.model.dto.AddSaasAccountDTO;
|
|
|
import com.persagy.fm.saas.account.model.dto.DeleteSaasAccountDTO;
|
|
|
+import com.persagy.fm.saas.account.model.dto.EnableSaasAccountDTO;
|
|
|
import com.persagy.fm.saas.account.model.dto.PageQuerySaasAccountDTO;
|
|
|
import com.persagy.fm.saas.account.model.vo.SaasAccountListItemVO;
|
|
|
import com.persagy.fm.saas.accountproject.client.SaasAccountProjectClient;
|
|
@@ -27,10 +26,9 @@ import com.persagy.fm.saas.accountproject.model.dto.AddSaasAccountProjectDTO;
|
|
|
import com.persagy.fm.saas.accountrole.client.SaasAccountRoleClient;
|
|
|
import com.persagy.fm.saas.accountrole.constant.enums.AccountRoleTypeEnum;
|
|
|
import com.persagy.fm.saas.accountrole.model.dto.AddSaasAccountRoleDTO;
|
|
|
-import com.persagy.fm.workresume.constant.enums.WorkResumeStateEnum;
|
|
|
-import com.persagy.fm.workresume.model.WorkResume;
|
|
|
+import com.persagy.fm.workresume.constant.enums.WorkResumeEnableStateEnum;
|
|
|
+import com.persagy.fm.workresume.constant.enums.WorkResumeHiredStateEnum;
|
|
|
import com.persagy.fm.workresume.model.dto.AddWorkResumeDTO;
|
|
|
-import com.persagy.fm.workresume.model.dto.QueryWorkResumeDTO;
|
|
|
import com.persagy.fm.workresume.service.IWorkResumeService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -40,6 +38,7 @@ import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 人员(Person) service层
|
|
@@ -350,6 +349,9 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
public IPage<ResponsePersonListItemVO> pageQueryPerson(PageQueryPersonDTO pageQueryPersonDTO) {
|
|
|
List<Person> people = personMapper.queryPersonList(pageQueryPersonDTO);
|
|
|
int total = personMapper.queryCount(pageQueryPersonDTO);
|
|
|
+
|
|
|
+ List<String> accountIds = people.stream().map(Person::getAccountId).collect(Collectors.toList());
|
|
|
+
|
|
|
// TODO: 2021/3/23 翻译器
|
|
|
// 数据转换
|
|
|
List<ResponsePersonListItemVO> responsePersonListItems = ConvertPersonTool.INSTANCE.convert2List(people);
|
|
@@ -359,47 +361,31 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- // @Override
|
|
|
- // public void resetPassWord(Long personId) {
|
|
|
- // }
|
|
|
-
|
|
|
@Override
|
|
|
public void disablePerson(String personId) {
|
|
|
// 禁用账号
|
|
|
Person person = queryPersonDetail(personId);
|
|
|
String accountId = person.getAccountId();
|
|
|
DeleteSaasAccountDTO deleteSaasAccountDTO = new DeleteSaasAccountDTO();
|
|
|
+ deleteSaasAccountDTO.setDefaultValue();
|
|
|
deleteSaasAccountDTO.setAccountId(accountId);
|
|
|
- saasAccountClient.dismissAccount(deleteSaasAccountDTO);
|
|
|
+ saasAccountClient.disableAccount(deleteSaasAccountDTO);
|
|
|
|
|
|
// 工作信息状态更新为禁用
|
|
|
- dismissWorkResume(personId);
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 禁用工作信息
|
|
|
- *
|
|
|
- * @param personId 人员id
|
|
|
- * @author lixing
|
|
|
- * @version V1.0 2021/3/30 8:20 下午
|
|
|
- */
|
|
|
- private void dismissWorkResume(String personId) {
|
|
|
- QueryWorkResumeDTO queryWorkResumeDTO = new QueryWorkResumeDTO();
|
|
|
- queryWorkResumeDTO.setPersonId(personId);
|
|
|
- queryWorkResumeDTO.setState(WorkResumeStateEnum.ON_JOB.getType());
|
|
|
- List<WorkResume> workResumes = workResumeService.queryWorkResumeList(queryWorkResumeDTO);
|
|
|
- workResumes.forEach(workResume -> workResume.setState(WorkResumeStateEnum.DISMISS.getType()));
|
|
|
- workResumeService.batchUpdateWorkResume(workResumes);
|
|
|
+ workResumeService.changeWorkResumeEnableStateByPersonId(
|
|
|
+ personId, null, WorkResumeEnableStateEnum.DISABLE.getType());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void dismissPerson(String personId) {
|
|
|
- // TODO: 2021/3/22 人员离职
|
|
|
+ public void dismissPerson(String personId, String depId) {
|
|
|
+ workResumeService.changeWorkResumeHiredStateByPersonId(
|
|
|
+ personId, depId, WorkResumeHiredStateEnum.DISMISS.getType());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void rejoinPerson(String personId) {
|
|
|
- // TODO: 2021/3/22 恢复入职
|
|
|
+ public void rejoinPerson(String personId, String depId) {
|
|
|
+ workResumeService.changeWorkResumeHiredStateByPersonId(
|
|
|
+ personId, depId, WorkResumeHiredStateEnum.ON_JOB.getType());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -415,7 +401,17 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
|
|
|
@Override
|
|
|
public void enablePerson(String personId) {
|
|
|
- // TODO: 2021/3/26 解禁人员
|
|
|
+ // 启用账号
|
|
|
+ Person person = queryPersonDetail(personId);
|
|
|
+ String accountId = person.getAccountId();
|
|
|
+ EnableSaasAccountDTO enableSaasAccountDTO = new EnableSaasAccountDTO();
|
|
|
+ enableSaasAccountDTO.setDefaultValue();
|
|
|
+ enableSaasAccountDTO.setAccountId(accountId);
|
|
|
+ saasAccountClient.enableAccount(enableSaasAccountDTO);
|
|
|
+
|
|
|
+ // 工作信息状态更新为启用
|
|
|
+ workResumeService.changeWorkResumeEnableStateByPersonId(
|
|
|
+ personId, null, WorkResumeEnableStateEnum.ENABLE.getType());
|
|
|
}
|
|
|
|
|
|
@Override
|