Commit 9e05df49 authored by huyuchen's avatar huyuchen

huych-入职登记提交

parent 75dbe78b
...@@ -26,7 +26,7 @@ public class EmployeeRegistrationPre extends BaseEntity { ...@@ -26,7 +26,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键ID") @Schema(description = "主键ID")
private Integer id; private String id;
@Schema(description = "员工姓名") @Schema(description = "员工姓名")
private String employeeName; private String employeeName;
......
...@@ -21,15 +21,15 @@ import java.util.Date; ...@@ -21,15 +21,15 @@ import java.util.Date;
* @date 2025-03-18 16:54:51 * @date 2025-03-18 16:54:51
*/ */
@Data @Data
@TableName("t_regist_warning_employee") @TableName("t_registe_warning_employee")
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Schema(description = "入职登记发送短信记录表") @Schema(description = "入职登记发送短信记录表")
public class TRegistWarningEmployee extends BaseEntity { public class TRegisteWarningEmployee extends BaseEntity {
/** /**
* 主键 * 主键
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.AUTO)
@ExcelProperty("主键") @ExcelProperty("主键")
@Schema(description = "主键") @Schema(description = "主键")
private Integer id; private Integer id;
......
...@@ -92,5 +92,10 @@ public class EmployeeRegistrationProjectListVo implements Serializable { ...@@ -92,5 +92,10 @@ public class EmployeeRegistrationProjectListVo implements Serializable {
@ExcelProperty("人员档案id") @ExcelProperty("人员档案id")
private String empInfoId; private String empInfoId;
@ExcelAttribute(name = "项目id",isExport = false)
@Schema(description = "项目id")
@ExcelProperty("项目id")
private String deptId;
} }
...@@ -13,7 +13,7 @@ import java.io.Serializable; ...@@ -13,7 +13,7 @@ import java.io.Serializable;
@Data @Data
public class SendMessageUpdateVo implements Serializable { public class SendMessageUpdateVo implements Serializable {
// 签名 // 签名
private Integer id; private String id;
//项目编码 //项目id
private String deptNo; private String deptId;
} }
package com.yifu.cloud.plus.v1.yifu.archives.controller; package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.yifu.cloud.plus.v1.yifu.archives.service.TRegistWarningEmployeeService; import com.yifu.cloud.plus.v1.yifu.archives.service.TRegisteWarningEmployeeService;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -20,6 +20,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -20,6 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "入职登记发送短信记录表管理") @Tag(name = "入职登记发送短信记录表管理")
public class TRegistWarningEmployeeController { public class TRegistWarningEmployeeController {
private final TRegistWarningEmployeeService tRegistWarningEmployeeService; private final TRegisteWarningEmployeeService tRegistWarningEmployeeService;
} }
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.mapper; package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee; import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegisteWarningEmployee;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
...@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
* @date 2025-03-18 16:54:51 * @date 2025-03-18 16:54:51
*/ */
@Mapper @Mapper
public interface TRegistWarningEmployeeMapper extends BaseMapper<TRegistWarningEmployee> { public interface TRegisteWarningEmployeeMapper extends BaseMapper<TRegisteWarningEmployee> {
} }
...@@ -6,5 +6,5 @@ public interface ScheduleService { ...@@ -6,5 +6,5 @@ public interface ScheduleService {
void scheduleTask(EmployeeRegistrationPre record); void scheduleTask(EmployeeRegistrationPre record);
void executeTask(Integer aId); void executeTask(String aId);
} }
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.service; package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee; import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegisteWarningEmployee;
/** /**
* 入职登记发送短信记录表 * 入职登记发送短信记录表
...@@ -26,6 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee; ...@@ -26,6 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee;
* @author huych * @author huych
* @date 2025-03-18 16:54:51 * @date 2025-03-18 16:54:51
*/ */
public interface TRegistWarningEmployeeService extends IService<TRegistWarningEmployee> { public interface TRegisteWarningEmployeeService extends IService<TRegisteWarningEmployee> {
} }
...@@ -64,7 +64,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -64,7 +64,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
private final TPreEmpMainMapper empMainMapper; private final TPreEmpMainMapper empMainMapper;
private final TRegistWarningEmployeeService employeeService; private final TRegisteWarningEmployeeService employeeService;
private final TEmployeeInfoMapper employeeInfoMapper; private final TEmployeeInfoMapper employeeInfoMapper;
...@@ -401,15 +401,15 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -401,15 +401,15 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
updatePre.setProcessStatus(CommonConstants.ONE_STRING); updatePre.setProcessStatus(CommonConstants.ONE_STRING);
} }
//生成短信发送的记录 //生成短信发送的记录
TRegistWarningEmployee smsEmployee = new TRegistWarningEmployee(); TRegisteWarningEmployee smsEmployee = new TRegisteWarningEmployee();
smsEmployee.setEmpName(updatePre.getEmployeeName()); smsEmployee.setEmpName(updatePre.getEmployeeName());
smsEmployee.setEmpPhone(updatePre.getEmpPhone()); smsEmployee.setEmpPhone(updatePre.getEmpPhone());
smsEmployee.setEmpIdcard(updatePre.getEmpIdcard()); smsEmployee.setEmpIdcard(updatePre.getEmpIdcard());
smsEmployee.setSendDate(DateUtil.getCurrentDateTime()); smsEmployee.setSendDate(DateUtil.getCurrentDateTime());
smsEmployee.setSendMethod(CommonConstants.ONE_INT); smsEmployee.setSendMethod(CommonConstants.ONE_INT);
smsEmployee.setWarningId(updatePre.getId().toString()); smsEmployee.setWarningId(updatePre.getId());
smsEmployee.setType(CommonConstants.ONE_STRING); smsEmployee.setType(CommonConstants.ONE_STRING);
smsEmployee.setDeptId(CommonConstants.ONE_STRING); smsEmployee.setDeptId(updatePre.getDeptId());
employeeService.save(smsEmployee); employeeService.save(smsEmployee);
paramVo.setLink(smsEmployee.getId().toString()); paramVo.setLink(smsEmployee.getId().toString());
params.add(paramVo); params.add(paramVo);
...@@ -436,14 +436,14 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -436,14 +436,14 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//如果有入职待建档数据同步更新 //如果有入职待建档数据同步更新
EmployeeRegistrationPre registrationPre = baseMapper.selectOne(Wrappers.<EmployeeRegistrationPre>query().lambda() EmployeeRegistrationPre registrationPre = baseMapper.selectOne(Wrappers.<EmployeeRegistrationPre>query().lambda()
.eq(EmployeeRegistrationPre::getEmpIdcard, info.getEmpIdcard()) .eq(EmployeeRegistrationPre::getEmpIdcard, info.getEmpIdcard())
.eq(EmployeeRegistrationPre::getDeptNo, updateVo.getDeptNo()) .eq(EmployeeRegistrationPre::getDeptId, updateVo.getDeptId())
.eq(EmployeeRegistrationPre::getProcessStatus, CommonConstants.ZERO_STRING) .eq(EmployeeRegistrationPre::getProcessStatus, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(registrationPre)) { if (Common.isNotNull(registrationPre)) {
registrationPre.setProcessStatus(CommonConstants.ONE_STRING); registrationPre.setProcessStatus(CommonConstants.ONE_STRING);
} }
//生成短信发送的记录 //生成短信发送的记录
TRegistWarningEmployee smsEmployee = new TRegistWarningEmployee(); TRegisteWarningEmployee smsEmployee = new TRegisteWarningEmployee();
smsEmployee.setEmpName(info.getEmpName()); smsEmployee.setEmpName(info.getEmpName());
smsEmployee.setEmpPhone(info.getEmpPhone()); smsEmployee.setEmpPhone(info.getEmpPhone());
smsEmployee.setSendDate(DateUtil.getCurrentDateTime()); smsEmployee.setSendDate(DateUtil.getCurrentDateTime());
...@@ -451,6 +451,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -451,6 +451,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
smsEmployee.setEmpIdcard(info.getEmpIdcard()); smsEmployee.setEmpIdcard(info.getEmpIdcard());
smsEmployee.setWarningId(info.getId()); smsEmployee.setWarningId(info.getId());
smsEmployee.setType(CommonConstants.TWO_STRING); smsEmployee.setType(CommonConstants.TWO_STRING);
smsEmployee.setDeptId(updateVo.getDeptId());
employeeService.save(smsEmployee); employeeService.save(smsEmployee);
paramVo.setLink(smsEmployee.getId().toString()); paramVo.setLink(smsEmployee.getId().toString());
params.add(paramVo); params.add(paramVo);
...@@ -513,7 +514,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -513,7 +514,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (null != deptNos && !deptNos.isEmpty()) { if (null != deptNos && !deptNos.isEmpty()) {
searchVo.setDeptNoList(deptNos); searchVo.setDeptNoList(deptNos);
} else { } else {
searchVo.setId(CommonConstants.ONE_INT_NEGATE); searchVo.setId(CommonConstants.ONE_STRING_NEGATE);
} }
} }
} }
......
...@@ -36,7 +36,7 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -36,7 +36,7 @@ public class ScheduleServiceImpl implements ScheduleService {
// 执行发送短信操作(事务内处理) // 执行发送短信操作(事务内处理)
@Override @Override
public void executeTask(Integer aId) { public void executeTask(String aId) {
transactionTemplate.execute(status -> { transactionTemplate.execute(status -> {
List<SendMessageUpdateVo> voList = new ArrayList<>(); List<SendMessageUpdateVo> voList = new ArrayList<>();
SendMessageUpdateVo updateVo = new SendMessageUpdateVo(); SendMessageUpdateVo updateVo = new SendMessageUpdateVo();
......
...@@ -1003,7 +1003,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap ...@@ -1003,7 +1003,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
if (null != deptNos && !deptNos.isEmpty()) { if (null != deptNos && !deptNos.isEmpty()) {
searchVo.setDeptNoList(deptNos); searchVo.setDeptNoList(deptNos);
} else { } else {
searchVo.setId(CommonConstants.ONE_INT_NEGATE); searchVo.setId(CommonConstants.ONE_STRING_NEGATE);
} }
} }
} }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
package com.yifu.cloud.plus.v1.yifu.archives.service.impl; package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee; import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegisteWarningEmployee;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TRegistWarningEmployeeMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TRegisteWarningEmployeeMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TRegistWarningEmployeeService; import com.yifu.cloud.plus.v1.yifu.archives.service.TRegisteWarningEmployeeService;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
*/ */
@Log4j2 @Log4j2
@Service @Service
public class TRegistWarningEmployeeServiceImpl extends ServiceImpl<TRegistWarningEmployeeMapper, TRegistWarningEmployee> implements TRegistWarningEmployeeService { public class TRegisteWarningEmployeeServiceImpl extends ServiceImpl<TRegisteWarningEmployeeMapper, TRegisteWarningEmployee> implements TRegisteWarningEmployeeService {
} }
...@@ -53,6 +53,7 @@ security: ...@@ -53,6 +53,7 @@ security:
- /tpreempmain/getPhoneByCardAndName - /tpreempmain/getPhoneByCardAndName
- /tpreempmain/sendCode - /tpreempmain/sendCode
- /tpreempmain/checkCode - /tpreempmain/checkCode
- /employeeregistrationpre/getEmployeeInfo
# 文件上传相关 支持阿里云、华为云、腾讯、minio # 文件上传相关 支持阿里云、华为云、腾讯、minio
......
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
a.emp_phone as phone, a.emp_phone as phone,
a.dept_id as deptId, a.dept_id as deptId,
a.emp_name as name a.emp_name as name
from t_regist_warning_employee a from t_registe_warning_employee a
where a.id = #{id} where a.id = #{id}
</select> </select>
</mapper> </mapper>
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<result property="dataSource" column="data_source"/> <result property="dataSource" column="data_source"/>
<result property="empProjectId" column="empProjectId"/> <result property="empProjectId" column="empProjectId"/>
<result property="empInfoId" column="empInfoId"/> <result property="empInfoId" column="empInfoId"/>
<result property="deptId" column="dept_id"/>
</resultMap> </resultMap>
<resultMap id="tCompleteMonitorExport" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorVo"> <resultMap id="tCompleteMonitorExport" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorVo">
...@@ -176,7 +177,8 @@ ...@@ -176,7 +177,8 @@
a.PROJECT_SOURCE as data_source, a.PROJECT_SOURCE as data_source,
c.CS_NAME as customer_username, c.CS_NAME as customer_username,
b.EMP_PHONE as emp_phone, b.EMP_PHONE as emp_phone,
b.id as empInfoId b.id as empInfoId,
a.DEPT_ID
FROM t_employee_project a FROM t_employee_project a
inner join t_employee_info b on a.EMP_ID = b.id inner join t_employee_info b on a.EMP_ID = b.id
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.TRegistWarningEmployeeMapper"> <mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.TRegisteWarningEmployeeMapper">
<resultMap id="tRegistWarningEmployeeMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee"> <resultMap id="tRegistWarningEmployeeMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TRegisteWarningEmployee">
<id property="id" column="id"/> <id property="id" column="id"/>
<result property="warningId" column="warning_id"/> <result property="warningId" column="warning_id"/>
<result property="empName" column="emp_name"/> <result property="empName" column="emp_name"/>
......
...@@ -4807,8 +4807,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4807,8 +4807,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())){ || CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())){
// 派减部分办理失败 // 派减部分办理失败
socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING); socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING);
sf.setSocialStatus(CommonConstants.TWELVE_STRING); if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.TWO_STRING.equals(sf.getPensionHandle()) || CommonConstants.THREE_STRING.equals(sf.getPensionHandle()))
sf.setSocialReduceStatus(CommonConstants.SIX_STRING); || (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.TWO_STRING.equals(sf.getMedicalHandle()) || CommonConstants.THREE_STRING.equals(sf.getMedicalHandle()))
|| (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()) || CommonConstants.THREE_STRING.equals(sf.getUnemployHandle()))
|| (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
|| (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
|| (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) {
sf.setSocialStatus(CommonConstants.EIGHT_STRING);
sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
} else {
sf.setSocialStatus(CommonConstants.TWELVE_STRING);
sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
}
socialInfo.setReduceCan(CommonConstants.ZERO_STRING); socialInfo.setReduceCan(CommonConstants.ZERO_STRING);
dis.setSocialHandleStatus(CommonConstants.THREE_STRING); dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
return; return;
......
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