Commit cabf93f9 authored by huyuchen's avatar huyuchen

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

parents 0dfcf3c5 2e828e73
...@@ -278,9 +278,9 @@ public class TEmployeeInfo extends BaseEntity { ...@@ -278,9 +278,9 @@ public class TEmployeeInfo extends BaseEntity {
/** /**
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6电子签) * 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6电子签)
* 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签 * 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签,7:预入职,9瓜子
*/ */
@Schema(description = "人员档案来源(字典:1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入、6电子签,7:预入职)") @Schema(description = "人员档案来源(字典:1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入、6电子签,7:预入职,9瓜子)")
private String fileSource; private String fileSource;
/** /**
......
...@@ -247,9 +247,9 @@ public class TEmployeeProject extends BaseEntity { ...@@ -247,9 +247,9 @@ public class TEmployeeProject extends BaseEntity {
private String tryPeriod; private String tryPeriod;
/** /**
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签8预入职) * 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签8预入职,9瓜子
*/ */
@Schema(description ="项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签、8预入职)") @Schema(description ="项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签、8预入职,9瓜子)")
private String projectSource; private String projectSource;
/** /**
......
...@@ -43,6 +43,15 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> { ...@@ -43,6 +43,15 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> {
*/ */
IPage<TGzEmpInfo> getTGzEmpInfoPage(Page<TGzEmpInfo> page, @Param("tGzEmpInfo") TGzEmpInfoSearchVo tGzEmpInfo); IPage<TGzEmpInfo> getTGzEmpInfoPage(Page<TGzEmpInfo> page, @Param("tGzEmpInfo") TGzEmpInfoSearchVo tGzEmpInfo);
/**
* @param offerId
* @Description: 查信息
* @Author: hgw
* @Date: 2025/6/20 15:24
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo
**/
TGzEmpInfo getInfoByOfferId(@Param("offerId") Integer offerId);
/** /**
* @Description: 导出前先查条数 * @Description: 导出前先查条数
* @Author: hgw * @Author: hgw
......
...@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo; ...@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; 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.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -77,6 +78,9 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> { ...@@ -77,6 +78,9 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
**/ **/
R<TEmployeeInfo> checkIdCard(TEmployeeInfo employeeInfo); R<TEmployeeInfo> checkIdCard(TEmployeeInfo employeeInfo);
// 新员工初始化信息
void setBaseData(TEmployeeInfo employeeInfo, String fileSource, YifuUser user);
/** /**
* @Description: 获取员工主码 * @Description: 获取员工主码
* @Author: hgw * @Author: hgw
......
...@@ -72,6 +72,6 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> { ...@@ -72,6 +72,6 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
* @Date: 2025/6/20 14:55 * @Date: 2025/6/20 14:55
* @return: boolean * @return: boolean
**/ **/
boolean saveEmpInfoByGz(TGzOfferInfo offerInfo); R<String> saveEmpInfoByGz(TGzOfferInfo offerInfo);
} }
...@@ -1672,7 +1672,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1672,7 +1672,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
* @Date: 2022/6/22 20:21 * @Date: 2022/6/22 20:21
* @return: void * @return: void
**/ **/
private void setBaseData(TEmployeeInfo employeeInfo, String fileSource, YifuUser user) { public void setBaseData(TEmployeeInfo employeeInfo, String fileSource, YifuUser user) {
// 新增档案 // 新增档案
employeeInfo.setCreateBy(user.getId()); employeeInfo.setCreateBy(user.getId());
employeeInfo.setCreateName(user.getNickname()); employeeInfo.setCreateName(user.getNickname());
......
...@@ -29,8 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap; ...@@ -29,8 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.*; import com.yifu.cloud.plus.v1.yifu.archives.mapper.*;
import com.yifu.cloud.plus.v1.yifu.archives.service.LGuaziOfferRecordService; import com.yifu.cloud.plus.v1.yifu.archives.service.LGuaziOfferRecordService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpDeclarationService; import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpDeclarationService;
import com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil; import com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
...@@ -41,6 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*; ...@@ -41,6 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
...@@ -95,6 +95,26 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -95,6 +95,26 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
private final TPreEmpDeclarationService tPreEmpDeclarationService; private final TPreEmpDeclarationService tPreEmpDeclarationService;
@Autowired
private UpmsDaprUtils upmsDaprUtils;
// 项目
private final TSettleDomainService tSettleDomainService;
// 人员档案表
private final TEmployeeInfoService tEmployeeInfoService;
// 项目档案表
private final TEmployeeProjectService tEmployeeProjectService;
// 员工职业资格信息表
private final TEmpProfessionalQualificationService tEmpProfessionalService;
// 员工工作履历信息表
private final TEmpWorkRecordingService tEmpWorkRecordingService;
// 紧急联络人
private final TEmpContactInfoService tEmpContactInfoService;
// 员工学历信息表
private final TEmpEducationService tEmpEducationService;
// 员工家庭信息表
private final TEmpFamilyService tEmpFamilyService;
/** /**
* 瓜子档案表简单分页查询 * 瓜子档案表简单分页查询
...@@ -122,10 +142,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -122,10 +142,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
return R.failed("数据异常,禁止操作"); return R.failed("数据异常,禁止操作");
} }
TGzEmpInfo gzEmpInfo = this.getOne(Wrappers.<TGzEmpInfo>query().lambda()
.eq(TGzEmpInfo::getOfferId, offerId) TGzEmpInfo gzEmpInfo = baseMapper.getInfoByOfferId(offerId);
.eq(TGzEmpInfo::getDelFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
// 还未生成档案,取offer里的信息 // 还未生成档案,取offer里的信息
if(Common.isEmpty(gzEmpInfo)){ if(Common.isEmpty(gzEmpInfo)){
...@@ -588,11 +606,283 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -588,11 +606,283 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
} }
} }
/**
* @Description: 保存到人员档案
* @Author: hgw
* @Date: 2025/6/20 16:44
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Override @Override
public boolean saveEmpInfoByGz(TGzOfferInfo offerInfo) { public R<String> saveEmpInfoByGz(TGzOfferInfo offerInfo) {
// TODO - 保存到人员档案 TSettleDomainSelectVo dept = tSettleDomainService.getSettleDomainVoByNo(CommonConstants.GZ_DEPT_NO);
if (dept == null || Common.isEmpty(dept.getId())) {
return R.failed("未找到瓜子项目!项目编码:"+CommonConstants.GZ_DEPT_NO);
}
String deptId = dept.getId();
if (Common.isEmpty(offerInfo.getId())) {
return R.failed("请传参Offer的ID!");
}
YifuUser user = getNewYifuUser();
// 保存到人员档案
// 先判断信息是否存在:
TGzEmpInfo gzEmpInfo = baseMapper.getInfoByOfferId(offerInfo.getId());
if (gzEmpInfo == null || Common.isEmpty(gzEmpInfo.getNationalId())) {
return R.failed("未找到瓜子档案信息!");
}
String empIdCard = gzEmpInfo.getNationalId();
// 翻译字典
Map<String, Map<String,String>> dictMap = new HashMap<>();
R<Map<String, Map<String,String>>> relDictMapR = upmsDaprUtils.getRelValueMapByOutDictType();
if (null != relDictMapR
&& relDictMapR.getCode() == CommonConstants.SUCCESS
&& Common.isNotNull(relDictMapR.getData())) {
dictMap = relDictMapR.getData();
}
// 1:档案
TEmployeeInfo emp = this.saveEmployeeInfo(gzEmpInfo, user, empIdCard, dictMap);
// 2:项目档案
this.saveEmployeeProject(emp, user, empIdCard, deptId, dept);
// TODO-3:其他附属信息与附件
return R.ok();
}
return true; private TEmployeeInfo saveEmployeeInfo(TGzEmpInfo gzEmpInfo, YifuUser user, String empIdCard, Map<String, Map<String,String>> dictMap) {
// 查找档案、项目档案,无则新建
TEmployeeInfo emp = tEmployeeInfoService.getInfoByIdcard(empIdCard);
if (emp == null) {
emp = tEmployeeInfoService.getInfoByDelete(empIdCard);
if (emp != null) {
emp.setCreateTime(LocalDateTime.now());
}
} else if (CommonConstants.ONE_INT == emp.getFileStatus()) {
emp.setCreateTime(LocalDateTime.now());
}
boolean isNew = false;
if (emp == null) {
isNew = true;
emp = new TEmployeeInfo();
}
// 转化瓜子属性
this.setEmpInfoByGz(gzEmpInfo, emp, dictMap);
// 新员工,塞基本属性
if (isNew) {
tEmployeeInfoService.setBaseData(emp, CommonConstants.NINE_STRING, user);
}
if (Common.isEmpty(emp.getEmpCode())) {
emp.setEmpCode(tEmployeeInfoService.getCode());
}
emp.setUpdateBy(user.getId());
emp.setUpdateTime(LocalDateTime.now());
emp.setFileStatus(CommonConstants.ZERO_INT);
emp.setDeleteFlag(CommonConstants.STATUS_NORMAL);
tEmployeeInfoService.saveOrUpdate(emp);
return emp;
}
private void saveEmployeeProject(TEmployeeInfo emp, YifuUser user, String empIdCard, String deptId, TSettleDomainSelectVo dept) {
// 查找档案、项目档案,无则新建
boolean isNew;
TEmployeeProject project = tEmployeeProjectService.getByEmpIdCardAndDeptId(empIdCard, deptId);
if (project == null) {
project = tEmployeeProjectService.getByEmpIdCardAndDeptIdAndDelete(empIdCard, deptId);
if (project != null) {
project.setCreateTime(LocalDateTime.now());
project.setProjectSource(CommonConstants.NINE_STRING);
project.setDeleteFlag(CommonConstants.STATUS_NORMAL);
}
} else if (CommonConstants.ONE_INT == project.getProjectStatus()) {
project.setCreateTime(LocalDateTime.now());
}
isNew = false;
if (project == null) {
isNew = true;
project = new TEmployeeProject();
}
project.setProjectStatus(CommonConstants.ZERO_INT);
if (Common.isEmpty(project.getStatus())) {
project.setStatus(CommonConstants.ZERO_INT);
}
if (Common.isEmpty(project.getEmpId()) && emp != null) {
project.setEmpId(emp.getId());
}
if (isNew) {
// 新项目档案塞基本属性
this.setNewEmpProjectBaseData(project, emp, dept, user);
}
tEmployeeProjectService.saveOrUpdate(project);
}
/**
* @Description: 新员工塞基本项目档案信息
* @Author: hgw
* @Date: 2024/6/19 14:26
* @return: void
**/
private void setNewEmpProjectBaseData(TEmployeeProject insTEmployeePro, TEmployeeInfo tEmployeeInfo, TSettleDomain tSettleDomain, YifuUser user) {
// 新增档案
insTEmployeePro.setId(String.valueOf(UUID.randomUUID()).replace("-", ""));
insTEmployeePro.setDeleteFlag(CommonConstants.STATUS_NORMAL);
insTEmployeePro.setStatus(CommonConstants.ZERO_INT);
//获取项目和单位信息
if (Common.isNotNull(tSettleDomain)) {
insTEmployeePro.setDeptId(tSettleDomain.getId());
insTEmployeePro.setDeptName(tSettleDomain.getDepartName());
insTEmployeePro.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType());
insTEmployeePro.setBusinessSecondType(tSettleDomain.getBusinessSecondType());
insTEmployeePro.setBusinessThirdType(tSettleDomain.getBusinessThirdType());
insTEmployeePro.setUnitId(tSettleDomain.getCustomerId());
insTEmployeePro.setUnitNo(tSettleDomain.getCustomerNo());
insTEmployeePro.setUnitName(tSettleDomain.getCustomerName());
String empNO = tEmployeeProjectService.getEmpNo(insTEmployeePro.getDeptNo());
insTEmployeePro.setEmpNo(empNO);
}
//员工编码生成规则
if (tEmployeeInfo != null) {
insTEmployeePro.setEmpId(tEmployeeInfo.getId());
insTEmployeePro.setEmpName(tEmployeeInfo.getEmpName());
insTEmployeePro.setEmpCode(tEmployeeInfo.getEmpCode());
}
insTEmployeePro.setCreateBy(user.getId());
insTEmployeePro.setCreateTime(LocalDateTime.now());
insTEmployeePro.setCreateName(user.getNickname());
insTEmployeePro.setProjectSource(CommonConstants.NINE_STRING);
}
/**
* @Description: 转化瓜子属性
* @Author: hgw
* @Date: 2025/6/20 16:17
* @return: void
**/
private void setEmpInfoByGz(TGzEmpInfo gzEmpInfo, TEmployeeInfo emp, Map<String, Map<String,String>> dictMap) {
// TODO - 转化
/*if (Common.isNotNull(gzEmpInfo.getEmpPhone())) {
emp.setEmpPhone(gzEmpInfo.getEmpPhone());
}
if (Common.isNotNull(gzEmpInfo.getEmpNatrue())) {
emp.setEmpNatrue(gzEmpInfo.getEmpNatrue());
}
emp.setEmpName(gzEmpInfo.getEmpName());
emp.setEmpIdcard(gzEmpInfo.getEmpIdcard());
emp.setEmpPhone(gzEmpInfo.getEmpPhone());
emp.setContactAddress(gzEmpInfo.getContactAddress());
emp.setContactProvince(gzEmpInfo.getContactProvince());
emp.setContactCity(gzEmpInfo.getContactCity());
emp.setContactTown(gzEmpInfo.getContactTown());
emp.setEmpBirthday(gzEmpInfo.getEmpBirthday());
emp.setEmpSex(gzEmpInfo.getEmpSex());
emp.setEmpAge(gzEmpInfo.getEmpAge());
emp.setBankProvince(gzEmpInfo.getBankProvince());
emp.setBankCity(gzEmpInfo.getBankCity());
emp.setBankName(gzEmpInfo.getBankName());
emp.setBankSubName(gzEmpInfo.getBankSubName());
emp.setBankNo(gzEmpInfo.getBankNo());
emp.setFileProvince(gzEmpInfo.getFileProvince());
emp.setFileCity(gzEmpInfo.getFileCity());
emp.setFileTown(gzEmpInfo.getFileTown());
emp.setEmpName(gzEmpInfo.getName());
emp.setEmpIdcard(gzEmpInfo.getEmpIdcard());
if (employee != null) {
empId = employee.getId();
BeanUtil.copyProperties(employee, tPreEmployeeInfo, ID);
emp.setOldId(employee.getId());
if (project != null) {
BeanUtil.copyProperties(project, tPreEmployeeProject, ID);
tPreEmployeeProject.setOldId(project.getId());
}
}
emp.setPreMainId(mainId);
emp.setCreateBy(user.getId());
emp.setCreateName(user.getNickname());
emp.setCreateTime(LocalDateTime.now());
emp.setValidityStart(info.getValidityStartValue());
if ("长期".equals(info.getValidityEnd())) {
emp.setValidityEnd(endDate);
} else {
emp.setValidityEnd(info.getValidityEndValue());
}
emp.setEmpNatrue(info.getEmpNatrueValue());
emp.setEmpSex(com.yifu.cloud.plus.v1.yifu.common.core.util.IdCardUtil.getSex(empIdCard));
java.sql.Date empBirthday = com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil.getBirthdate(empIdCard);
emp.setEmpBirthday(empBirthday);
emp.setEmpAge(com.yifu.cloud.plus.v1.yifu.common.core.util.IdCardUtil.IdNOToAge(empIdCard));
emp.setEmpMarriStatus(info.getEmpMarriStatusValue());
emp.setEmpNational(info.getEmpNationalValue());
emp.setPoliticalStatus(info.getPoliticalStatusValue());
emp.setEmpEmail(info.getEmpEmail());
emp.setEmpPhone(info.getEmpPhone());
// 2024-10-30 20:02:53 测试jld认为如果没写户籍省,则带出档案。我认为有道理
if (Common.isNotNull(info.getIdProvinceValue())) {
emp.setIdProvince(Integer.parseInt(info.getIdProvinceValue()));
if (Common.isNotNull(info.getIdCityValue())) {
emp.setIdCity(Integer.parseInt(info.getIdCityValue()));
} else {
emp.setIdCity(null);
}
if (Common.isNotNull(info.getIdTownValue())) {
emp.setIdTown(Integer.parseInt(info.getIdTownValue()));
} else {
emp.setIdTown(null);
}
}
emp.setEmpRegisType(info.getEmpRegisTypeValue());
if (Common.isNotNull(info.getFileProvinceValue())) {
emp.setFileProvince(Integer.parseInt(info.getFileProvinceValue()));
}
if (Common.isNotNull(info.getFileCityValue())) {
emp.setFileCity(Integer.parseInt(info.getFileCityValue()));
}
if (Common.isNotNull(info.getFileTownValue())) {
emp.setFileTown(Integer.parseInt(info.getFileTownValue()));
} else {
emp.setFileTown(null);
}
if (Common.isNotNull(info.getEducationNameValue())) {
emp.setHignEducation(info.getEducationNameValue());
if ("5".equals(info.getEducationNameValue())
|| "6".equals(info.getEducationNameValue())
|| "7".equals(info.getEducationNameValue())
|| "8".equals(info.getEducationNameValue())) {
emp.setIsCollege(CommonConstants.ONE_INT);
} else {
emp.setIsCollege(CommonConstants.ZERO_INT);
}
}
emp.setSchool(info.getSchool());
emp.setMajor(info.getMajor());
emp.setAdmissionDate(info.getEntryDateValue());
emp.setGradutionDate(info.getGradutionDateValue());
emp.setContactAddress(info.getContactAddress());
// 2024-10-17 14:30:06 倩倩上午测试用例评审会说要联动导入,没有卡号,后面填写的不生效:
if (Common.isNotNull(info.getBankNo())) {
emp.setBankName(info.getBankName());
emp.setBankProvince(info.getBankProvinceValue());
emp.setBankCity(info.getBankCityValue());
emp.setBankSubName(info.getBankSubName());
emp.setBankNo(info.getBankNo());
emp.setTaxMonth(info.getTaxMonthValue());
} else {
preEmployeeInfoNeedSalaryList.add(tPreEmployeeInfo);
needSalaryList.add(empIdCard);
}
emp.setTaxMonthFlag(CommonConstants.ONE_STRING);
emp.setContactProvince(info.getContactProvinceValue());
emp.setContactCity(info.getContactCityValue());
emp.setContactTown(info.getContactTownValue());
emp.setFirstWorkFlag(info.getFirstWorkFlagValue());
emp.setHaveQualification(info.getHaveQualificationValue());
emp.setFileSource(CommonConstants.SEVEN_STRING);*/
} }
} }
...@@ -275,7 +275,10 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -275,7 +275,10 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if("97".equals(tGzOfferInfo.getOfferStatus())){ if("97".equals(tGzOfferInfo.getOfferStatus())){
// 1、生成人员档案信息、项目档案信息 // 1、生成人员档案信息、项目档案信息
// hgw 2025-6-20 14:55:12 // hgw 2025-6-20 14:55:12
tGzEmpInfoService.saveEmpInfoByGz(findInfo); R<String> saveEmpInfoR = tGzEmpInfoService.saveEmpInfoByGz(findInfo);
if (saveEmpInfoR != null && Common.isNotNull(saveEmpInfoR.getCode()) && saveEmpInfoR.getCode() != CommonConstants.SUCCESS) {
return saveEmpInfoR;
}
// 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同, // 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】, // 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
......
...@@ -393,6 +393,13 @@ ...@@ -393,6 +393,13 @@
</if> </if>
</if> </if>
</sql> </sql>
<!--查信息-->
<select id="getInfoByOfferId" resultMap="tGzEmpInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_gz_emp_info a
where a.del_flag = '0' and a.offer_id = #{offerId} limit 1
</select>
<!--tGzEmpInfo简单分页查询--> <!--tGzEmpInfo简单分页查询-->
<select id="getTGzEmpInfoPage" resultMap="tGzEmpInfoMap"> <select id="getTGzEmpInfoPage" resultMap="tGzEmpInfoMap">
SELECT SELECT
......
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
a.INVOICE_TITLE_SALARY as 'businessSubjectName' a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM FROM
t_settle_domain a t_settle_domain a
WHERE a.id=#{id} GROUP BY a.id WHERE a.id=#{id} limit 1
</select> </select>
<select id="getSettleDomainVoByNo" <select id="getSettleDomainVoByNo"
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
a.INVOICE_TITLE_SALARY as 'businessSubjectName' a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM FROM
t_settle_domain a t_settle_domain a
WHERE a.DEPART_NO = #{deptNo} GROUP BY a.id WHERE a.DEPART_NO = #{deptNo} limit 1
</select> </select>
......
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