Commit 0a82cbcb authored by hongguangwu's avatar hongguangwu

MVP1.7.12-保存档案

parent 9c4411a0
...@@ -43,6 +43,7 @@ public interface TGzOfferInfoMapper extends BaseMapper<TGzOfferInfo> { ...@@ -43,6 +43,7 @@ public interface TGzOfferInfoMapper extends BaseMapper<TGzOfferInfo> {
* @return IPage<TGzOfferInfoVo> * @return IPage<TGzOfferInfoVo>
*/ */
IPage<TGzOfferInfoVo> getTGzOfferInfoPage(Page<TGzOfferInfoVo> page, @Param("tGzOfferInfo") TGzOfferInfoVo tGzOfferInfo); IPage<TGzOfferInfoVo> getTGzOfferInfoPage(Page<TGzOfferInfoVo> page, @Param("tGzOfferInfo") TGzOfferInfoVo tGzOfferInfo);
TGzOfferInfoVo getInfoById(@Param("id") Integer id);
/** /**
* 瓜子offer信息接收表简单分页查询 * 瓜子offer信息接收表简单分页查询
......
...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
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.archives.vo.TGzEmpInfoSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoSearchVo;
...@@ -63,4 +64,14 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> { ...@@ -63,4 +64,14 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/ **/
R<Boolean> saveTGzEmpInfo(TGzEmpInfoSearchVo tGzEmpInfoVo); R<Boolean> saveTGzEmpInfo(TGzEmpInfoSearchVo tGzEmpInfoVo);
/**
* @param offerInfo offer信息
* @Description: 保存到人员档案
* @Author: hgw
* @Date: 2025/6/20 14:55
* @return: boolean
**/
boolean saveEmpInfoByGz(TGzOfferInfo offerInfo);
} }
...@@ -30,7 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.*; ...@@ -30,7 +30,6 @@ 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.TAttaInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzOfferInfoService;
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.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
...@@ -70,7 +69,7 @@ import java.util.*; ...@@ -70,7 +69,7 @@ import java.util.*;
@EnableConfigurationProperties(DaprUpmsProperties.class) @EnableConfigurationProperties(DaprUpmsProperties.class)
public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpInfo> implements TGzEmpInfoService { public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpInfo> implements TGzEmpInfoService {
private final TGzOfferInfoService gzOfferInfoService; private final TGzOfferInfoMapper gzOfferInfoMapper;
private final TGzEmpContactInfoMapper gzEmpContactInfoMapper; private final TGzEmpContactInfoMapper gzEmpContactInfoMapper;
...@@ -112,10 +111,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -112,10 +111,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
public R<TGzEmpInfoSearchVo> getInfoByOfferId(Integer offerId) { public R<TGzEmpInfoSearchVo> getInfoByOfferId(Integer offerId) {
TGzEmpInfoSearchVo gzEmpInfoVo = new TGzEmpInfoSearchVo(); TGzEmpInfoSearchVo gzEmpInfoVo = new TGzEmpInfoSearchVo();
TGzOfferInfo gzOfferInfo = gzOfferInfoService.getOne(Wrappers.<TGzOfferInfo>query().lambda() TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.getInfoById(offerId);
.eq(TGzOfferInfo::getId, offerId)
.eq(TGzOfferInfo::getDelFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if(Common.isEmpty(gzOfferInfo)){ if(Common.isEmpty(gzOfferInfo)){
return R.failed("数据异常,禁止操作"); return R.failed("数据异常,禁止操作");
} }
...@@ -440,19 +436,19 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -440,19 +436,19 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
public R<Boolean> saveTGzEmpInfo(TGzEmpInfoSearchVo tGzEmpInfoVo) { public R<Boolean> saveTGzEmpInfo(TGzEmpInfoSearchVo tGzEmpInfoVo) {
YifuUser user = getNewYifuUser(); YifuUser user = getNewYifuUser();
TGzEmpInfo tGzEmpInfo = tGzEmpInfoVo; TGzEmpInfo tGzEmpInfo = tGzEmpInfoVo;
String bizId = tGzEmpInfoVo.getBizId(); Integer offerId = tGzEmpInfoVo.getOfferId();
if (Common.isEmpty(bizId)) { if (Common.isEmpty(offerId)) {
return R.failed("请传参流程ID!"); return R.failed("请传参流程ID!");
} else { } else {
TGzOfferInfo gzOfferInfo = gzOfferInfoService.getById(bizId); TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.getInfoById(offerId);
if(gzOfferInfo == null || Common.isEmpty(gzOfferInfo) || Common.isEmpty(gzOfferInfo.getBizId())){ if(gzOfferInfo == null || Common.isEmpty(gzOfferInfo) || Common.isEmpty(gzOfferInfo.getBizId())){
return R.failed("未找到瓜子Offer数据,Offer的ID="+ bizId); return R.failed("未找到瓜子Offer数据,Offer的ID="+ offerId);
} }
if (Common.isEmpty(gzOfferInfo.getOfferStatus()) || !"9".equals(gzOfferInfo.getOfferStatus())) { if (Common.isEmpty(gzOfferInfo.getOfferStatus()) || !"9".equals(gzOfferInfo.getOfferStatus())) {
return R.failed("瓜子Offer状态不对("+gzOfferInfo.getOfferStatus()+"),不可编辑,Offer的ID="+ bizId); return R.failed("瓜子Offer状态不对("+gzOfferInfo.getOfferStatus()+"),不可编辑,Offer的ID="+ offerId);
} }
gzOfferInfo.setOfferStatus("12"); gzOfferInfo.setOfferStatus("12");
gzOfferInfoService.updateById(gzOfferInfo); gzOfferInfoMapper.updateById(gzOfferInfo);
} }
String gzEmpId = tGzEmpInfoVo.getId(); String gzEmpId = tGzEmpInfoVo.getId();
...@@ -554,4 +550,11 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -554,4 +550,11 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
return R.ok(); return R.ok();
} }
@Override
public boolean saveEmpInfoByGz(TGzOfferInfo offerInfo) {
// TODO - 保存到人员档案
return true;
}
} }
...@@ -37,9 +37,9 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo; ...@@ -37,9 +37,9 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegisteWarningEmployee; import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegisteWarningEmployee;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzEmpInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzOfferInfoMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzOfferInfoMapper;
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.TGzEmpInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzOfferInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TGzOfferInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TRegisteWarningEmployeeService; import com.yifu.cloud.plus.v1.yifu.archives.service.TRegisteWarningEmployeeService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
...@@ -98,7 +98,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -98,7 +98,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 当前Offer更新状态,无法再发起更新:5:拒绝Offer、10:取消offer、8:合同审核通过、99:已归档 // 当前Offer更新状态,无法再发起更新:5:拒绝Offer、10:取消offer、8:合同审核通过、99:已归档
private final String[] failStatusArr = {"5", "10", "8", "99"}; private final String[] failStatusArr = {"5", "10", "8", "99"};
private final TGzEmpInfoMapper gzEmpInfoMapper; private final TGzEmpInfoService tGzEmpInfoService;
/** /**
* 瓜子offer信息接收表简单分页查询 * 瓜子offer信息接收表简单分页查询
...@@ -273,8 +273,9 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -273,8 +273,9 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 审核通过, 执行一下2个事件: // 审核通过, 执行一下2个事件:
if("97".equals(tGzOfferInfo.getOfferStatus())){ if("97".equals(tGzOfferInfo.getOfferStatus())){
// todo 1、生成人员档案信息、项目档案信息 // 1、生成人员档案信息、项目档案信息
// hgw 2025-6-20 14:55:12
tGzEmpInfoService.saveEmpInfoByGz(findInfo);
// 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同, // 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】, // 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
...@@ -346,7 +347,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -346,7 +347,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
@Override @Override
public void saveContractInfoToGzEmpInfo(TEmployeeContractInfo contractInfo, Integer offerId, String workLocation){ public void saveContractInfoToGzEmpInfo(TEmployeeContractInfo contractInfo, Integer offerId, String workLocation){
// 获取档案信息 // 获取档案信息
TGzEmpInfo gzEmpInfo = gzEmpInfoMapper.selectOne(Wrappers.<TGzEmpInfo>query().lambda() TGzEmpInfo gzEmpInfo = tGzEmpInfoService.getOne(Wrappers.<TGzEmpInfo>query().lambda()
.eq(TGzEmpInfo::getOfferId, offerId) .eq(TGzEmpInfo::getOfferId, offerId)
.eq(TGzEmpInfo::getDelFlag, CommonConstants.ZERO_STRING) .eq(TGzEmpInfo::getDelFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
...@@ -395,7 +396,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -395,7 +396,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
gzEmpInfo.setContractState("A"); gzEmpInfo.setContractState("A");
// 存合同信息 // 存合同信息
gzEmpInfoMapper.updateById(gzEmpInfo); tGzEmpInfoService.updateById(gzEmpInfo);
} }
} }
......
...@@ -247,6 +247,14 @@ ...@@ -247,6 +247,14 @@
</if> </if>
</if> </if>
</sql> </sql>
<!--根据ID获取信息-->
<select id="getInfoById" resultMap="tGzOfferInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_gz_offer_info a
where a.del_flag = '0' AND a.id = #{id} limit 1
</select>
<!--tGzOfferInfo简单分页查询--> <!--tGzOfferInfo简单分页查询-->
<select id="getTGzOfferInfoPage" resultMap="tGzOfferInfoMap"> <select id="getTGzOfferInfoPage" resultMap="tGzOfferInfoMap">
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