Commit 2e828e73 authored by hongguangwu's avatar hongguangwu

MVP1.7.12-保存人员档案1

parent 4fde56fc
......@@ -278,9 +278,9 @@ public class TEmployeeInfo extends BaseEntity {
/**
* 人员档案来源(字典: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;
/**
......
......@@ -247,9 +247,9 @@ public class TEmployeeProject extends BaseEntity {
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;
/**
......
......@@ -43,6 +43,15 @@ public interface TGzEmpInfoMapper extends BaseMapper<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: 导出前先查条数
* @Author: hgw
......
......@@ -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.vo.*;
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 javax.servlet.http.HttpServletResponse;
......@@ -77,6 +78,9 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
**/
R<TEmployeeInfo> checkIdCard(TEmployeeInfo employeeInfo);
// 新员工初始化信息
void setBaseData(TEmployeeInfo employeeInfo, String fileSource, YifuUser user);
/**
* @Description: 获取员工主码
* @Author: hgw
......
......@@ -72,6 +72,6 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
* @Date: 2025/6/20 14:55
* @return: boolean
**/
boolean saveEmpInfoByGz(TGzOfferInfo offerInfo);
R<String> saveEmpInfoByGz(TGzOfferInfo offerInfo);
}
......@@ -1672,7 +1672,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
* @Date: 2022/6/22 20:21
* @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.setCreateName(user.getNickname());
......
......@@ -275,7 +275,10 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if("97".equals(tGzOfferInfo.getOfferStatus())){
// 1、生成人员档案信息、项目档案信息
// 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、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
......
......@@ -393,6 +393,13 @@
</if>
</if>
</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简单分页查询-->
<select id="getTGzEmpInfoPage" resultMap="tGzEmpInfoMap">
SELECT
......
......@@ -354,7 +354,7 @@
a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM
t_settle_domain a
WHERE a.id=#{id} GROUP BY a.id
WHERE a.id=#{id} limit 1
</select>
<select id="getSettleDomainVoByNo"
......@@ -367,7 +367,7 @@
a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM
t_settle_domain a
WHERE a.DEPART_NO = #{deptNo} GROUP BY a.id
WHERE a.DEPART_NO = #{deptNo} limit 1
</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