|
@@ -7,14 +7,18 @@ 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.jeeplus.sys.service.dto.UserDTO;
|
|
|
import com.jeeplus.sys.utils.StringUtils;
|
|
|
+import com.jeeplus.sys.utils.UserUtils;
|
|
|
import com.jeeplus.test.jobPosion.utils.BeanUtils;
|
|
|
+import com.jeeplus.test.mould.service.SerialnumTplService;
|
|
|
import com.jeeplus.test.oss.service.OssService;
|
|
|
import com.jeeplus.test.rank.service.dto.RankSystemTableDTO;
|
|
|
import com.jeeplus.test.roster.domain.*;
|
|
|
import com.jeeplus.test.roster.mapper.RosterBaseMapper;
|
|
|
import com.jeeplus.test.roster.service.dto.*;
|
|
|
import com.jeeplus.test.roster.service.mapstruct.*;
|
|
|
+import com.jeeplus.test.workContract.service.dto.WorkContractInfoDto;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -57,6 +61,9 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
|
|
|
@Autowired
|
|
|
private OssService ossService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SerialnumTplService serialnumTplService;
|
|
|
+
|
|
|
public IPage<RosterBaseDTO> findList(Page<RosterBaseDTO> page, QueryWrapper<RosterBase> queryWrapper){
|
|
|
queryWrapper.eq("rb.del_flag","0");
|
|
|
IPage<RosterBaseDTO> rosterBaseDTOIPage = rosterBaseMapper.findList(page, queryWrapper);
|
|
@@ -118,7 +125,7 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
|
|
|
return rosterBaseDTO;
|
|
|
}
|
|
|
|
|
|
- public ResponseEntity saveRoster(RosterBaseDTO rosterBaseDTO){
|
|
|
+ public ResponseEntity saveRoster(RosterBaseDTO rosterBaseDTO) throws Exception{
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(rosterBaseDTO)){
|
|
|
if(StringUtils.isNotBlank(rosterBaseDTO.getId())){
|
|
@@ -135,6 +142,12 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
|
|
|
}
|
|
|
}
|
|
|
}else{
|
|
|
+ //获取当前登录人信息
|
|
|
+ UserDTO userDTO = UserUtils.getCurrentUserDTO();
|
|
|
+ //工号生成
|
|
|
+ String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), RosterBaseDTO.BIZ_CODE);
|
|
|
+ rosterBaseDTO.setJobNo(serialNum);
|
|
|
+
|
|
|
if(StringUtils.isNotBlank(rosterBaseDTO.getIdCard())){
|
|
|
List<RosterBase> rosterBaseList = this.list(new QueryWrapper<RosterBase>().eq("id_card", rosterBaseDTO.getIdCard()));
|
|
|
if(CollectionUtil.isNotEmpty(rosterBaseList)){
|