Commit bfa46593 authored by huyuchen's avatar huyuchen

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

# Conflicts:
#	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeRegistrationPreController.java
#	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/EmployeeRegistrationPreMapper.java
#	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/EmployeeRegistrationPreService.java
#	yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
parents 79c8d650 72f7b228
......@@ -171,6 +171,20 @@ public class EmployeeRegistrationPreController {
return employeeRegistrationPreService.batchSendMessage(vo, type);
}
/**
* @Description: 判断简档详档(员工类型:代理的是简档,“非代理”且员工合同类型为:空、标准合同、劳务派遣合同、补贴合同 是详档,其余为简档)
* @Author: hgw
* @Date: 2025/3/20 15:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation(summary = "判断简档详档", description = "判断简档详档")
@SysLog("判断简档详档" )
@GetMapping("/judgeIsSimple")
public R<String> judgeIsSimple(@RequestParam String empIdCard, @RequestParam String deptId) {
return R.ok(employeeRegistrationPreService.judgeIsSimple(empIdCard, deptId));
}
/**
* 查询身份信息
*
......
......@@ -47,4 +47,21 @@ public interface EmployeeRegistrationPreMapper extends BaseMapper<EmployeeRegist
MessageTempleteVo selectTempleteVo(@Param("id") String id);
EmployeeInfoMsgVo getEmployeeArchivesInfo(@Param("id") String id);
/**
* @Description: 判断简档详档-优先从档案维护任务表
* @Author: hgw
* @Date: 2025/3/20 15:20
* @return: java.lang.String
**/
String judegIsSimpleByPre(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
/**
* @Description: 判断简档详档-从项目档案表
* @Author: hgw
* @Date: 2025/3/20 15:20
* @return: java.lang.String
**/
String judegIsSimpleByEmpProject(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
}
......@@ -88,4 +88,14 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
R getEmployeeInfo(String cardOrId);
/**
* @param empIdCard 身份证
* @param deptId 项目ID
* @Description: 判断简档详档(员工类型:代理的是简档,“非代理”且员工合同类型为:空、标准合同、劳务派遣合同、补贴合同 是详档,其余为简档)
* @Author: hgw
* @Date: 2025/3/20 15:03
* @return: java.lang.String
**/
String judgeIsSimple(String empIdCard, String deptId);
}
......@@ -546,4 +546,23 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return false;
}
/**
* @Description: 判断简档详档(员工类型:代理的是简档,“非代理”且员工合同类型为:空、标准合同、劳务派遣合同、补贴合同 是详档,其余为简档)
* @Author: hgw
* @Date: 2025/3/20 15:22
* @return: java.lang.String
**/
@Override
public String judgeIsSimple(String empIdCard, String deptId) {
// 类型1详档2简档
String type = baseMapper.judegIsSimpleByPre(empIdCard, deptId);
if (Common.isEmpty(type)) {
type = baseMapper.judegIsSimpleByEmpProject(empIdCard, deptId);
}
if (Common.isEmpty(type)) {
type = CommonConstants.ONE_STRING;
}
return type;
}
}
......@@ -276,6 +276,20 @@
where id = #{id}
</select>
<!-- 判断简档详档-优先从档案维护任务表 -->
<select id="judegIsSimpleByPre" resultType="java.lang.String">
select
if(a.emp_nature is null or (a.emp_nature != '2' and (a.contract_type is null or a.contract_type in ('1','20','9'))),1,2) 类型1详档2简档
from employee_registration_pre a where a.emp_idcard = #{empIdCard} and a.dept_id = #{deptId}
</select>
<!-- 判断简档详档-从项目档案表 -->
<select id="judegIsSimpleByEmpProject" resultType="java.lang.String">
select
if(a.EMP_NATRUE is null or (a.EMP_NATRUE != '2' and (a.contract_type is null or a.contract_type in ('1','20','9'))),1,2) 类型1详档2简档
from t_employee_project a where a.DELETE_FLAG = '0' and a.PROJECT_STATUS = 0 and a.emp_idcard = #{empIdCard} and a.dept_id = #{deptId}
</select>
<select id="getEmployeeArchivesInfo" resultMap="getEmployeeInfoMap">
SELECT
a.emp_idcard as card,
......
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