Commit d497ab97 authored by fangxinjiang's avatar fangxinjiang

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

parents 989f4d64 72954822
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 入职登记发送短信记录表
*
* @author huych
* @date 2025-03-18 16:54:51
*/
@Data
@TableName("t_regist_warning_employee")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "入职登记发送短信记录表")
public class TRegistWarningEmployee extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private Integer id;
/**
* 入职待建档明细id
*/
@ExcelAttribute(name = "入职待建档明细id", isNotEmpty = true, errorInfo = "入职待建档明细id不能为空", maxLength = 32)
@NotBlank(message = "入职待建档明细id不能为空")
@Length(max = 32, message = "入职待建档明细id不能超过32个字符")
@ExcelProperty("入职待建档明细id")
@Schema(description = "入职待建档明细id")
private String warningId;
/**
* 姓名
*/
@ExcelAttribute(name = "姓名", maxLength = 32)
@Length(max = 32, message = "姓名不能超过32个字符")
@ExcelProperty("姓名")
@Schema(description = "姓名")
private String empName;
/**
* 身份证
*/
@ExcelAttribute(name = "身份证", maxLength = 50)
@Length(max = 50, message = "身份证不能超过50个字符")
@ExcelProperty("身份证")
@Schema(description = "身份证")
private String empIdcard;
/**
* 联系方式
*/
@ExcelAttribute(name = "联系方式", maxLength = 50)
@Length(max = 50, message = "联系方式不能超过50个字符")
@ExcelProperty("联系方式")
@Schema(description = "联系方式")
private String empPhone;
/**
* 发送时间
*/
@ExcelAttribute(name = "发送时间", isDate = true)
@ExcelProperty("发送时间")
@Schema(description = "发送时间")
private Date sendDate;
/**
* 回执id
*/
@ExcelAttribute(name = "回执id", maxLength = 50)
@Length(max = 50, message = "回执id不能超过50个字符")
@ExcelProperty("回执id")
@Schema(description = "回执id")
private String bizId;
/**
* 发送方式:0自动;1手动
*/
@ExcelAttribute(name = "发送方式:0自动;1手动")
@ExcelProperty("发送方式:0自动;1手动")
@Schema(description = "发送方式:0自动;1手动")
private Integer sendMethod;
/**
* 短信回执内容
*/
@ExcelAttribute(name = "短信回执内容", maxLength = 100)
@Length(max = 100, message = "短信回执内容不能超过100个字符")
@ExcelProperty("短信回执内容")
@Schema(description = "短信回执内容")
private String message;
}
...@@ -51,17 +51,4 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre { ...@@ -51,17 +51,4 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
@Schema(description = "列表类型 1 待办 2监控 3入职确认信息") @Schema(description = "列表类型 1 待办 2监控 3入职确认信息")
private String type; private String type;
@Schema(description = "入职待确认")
@TableField(exist = false)
private String mIdOne;
@Schema(description = "入职待建档")
@TableField(exist = false)
private String mIdTwo;
@Schema(description = "入职待完整")
@TableField(exist = false)
private String mIdThree;
} }
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
import java.io.Serializable;
/**
* @Author fxj
* @Date 2022/8/1
* @Description
* @Version 1.0
*/
@Data
public class MessageTempleteVo implements Serializable {
// 签名
String signName;
// 模版编号
String templeteCode;
}
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author fxj
* @Date 2022/8/1
* @Description
* @Version 1.0
*/
@Data
public class SendMessageUpdateVo implements Serializable {
// 签名
private List<String> idList;
// 类型
private String type;
//项目编码
private String deptNo;
}
...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre; ...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre;
import com.yifu.cloud.plus.v1.yifu.archives.service.EmployeeRegistrationPreService; import com.yifu.cloud.plus.v1.yifu.archives.service.EmployeeRegistrationPreService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.SendMessageUpdateVo;
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 com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
...@@ -114,8 +115,6 @@ public class EmployeeRegistrationPreController { ...@@ -114,8 +115,6 @@ public class EmployeeRegistrationPreController {
* @Author huyc * @Author huyc
* @Description 新增入职待建档信息 * @Description 新增入职待建档信息
* @Date 14:34 2025/3/14 * @Date 14:34 2025/3/14
* @Param
* @return
**/ **/
@Inner @Inner
@PostMapping("/inner/saveRegistPreInfo") @PostMapping("/inner/saveRegistPreInfo")
...@@ -146,4 +145,28 @@ public class EmployeeRegistrationPreController { ...@@ -146,4 +145,28 @@ public class EmployeeRegistrationPreController {
public R getListCount(@RequestBody EmployeeRegistrationPreSearchVo searchVo) { public R getListCount(@RequestBody EmployeeRegistrationPreSearchVo searchVo) {
return employeeRegistrationPreService.getListCount(searchVo); return employeeRegistrationPreService.getListCount(searchVo);
} }
/**
* 入职待建档入职审核
* @param employeeRegistrationPre 入职待建档表
* @return R
*/
@Operation(summary = "入职待建档入职审核", description = "入职待建档入职审核")
@SysLog("入职待建档入职审核" )
@PostMapping("/registrationPreAudit")
public R registrationPreAudit(@RequestBody EmployeeRegistrationPre employeeRegistrationPre) {
return employeeRegistrationPreService.registrationPreAudit(employeeRegistrationPre);
}
/**
* 批量发送入职信息收集短信
* @param vo vo
* @return R
*/
@Operation(summary = "批量发送入职信息收集短信", description = "批量发送入职信息收集短信")
@SysLog("批量发送入职信息收集短信" )
@PostMapping("/batchSms")
public R batchSendMessage(@RequestBody SendMessageUpdateVo vo) {
return employeeRegistrationPreService.batchSendMessage(vo);
}
} }
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.yifu.cloud.plus.v1.yifu.archives.service.TRegistWarningEmployeeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 入职登记发送短信记录表
*
* @author huych
* @date 2025-03-18 16:54:51
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tregistwarningemployee" )
@Tag(name = "入职登记发送短信记录表管理")
public class TRegistWarningEmployeeController {
private final TRegistWarningEmployeeService tRegistWarningEmployeeService;
}
...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre; ...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreExportVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreExportVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreInfoExportVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreInfoExportVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.MessageTempleteVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -31,18 +32,20 @@ public interface EmployeeRegistrationPreMapper extends BaseMapper<EmployeeRegist ...@@ -31,18 +32,20 @@ public interface EmployeeRegistrationPreMapper extends BaseMapper<EmployeeRegist
* @param searchVo 导出查询vo * @param searchVo 导出查询vo
* @return * @return
*/ */
long selectExportCount(@Param("EmployeeRegistrationPre") EmployeeRegistrationPreSearchVo searchVo); long selectExportCount(@Param("employeeRegistrationPre") EmployeeRegistrationPreSearchVo searchVo);
/** /**
* 入职待建档表导出列表查询 * 入职待建档表导出列表查询
* @param searchVo 导出查询vo * @param searchVo 导出查询vo
* @return * @return
*/ */
List<EmployeeRegistrationPreExportVo> selectExportList(@Param("EmployeeRegistrationPre") EmployeeRegistrationPreSearchVo searchVo); List<EmployeeRegistrationPreExportVo> selectExportList(@Param("employeeRegistrationPre") EmployeeRegistrationPreSearchVo searchVo);
/** /**
* 入职确认信息导出列表查询 * 入职确认信息导出列表查询
* @param searchVo 导出查询vo * @param searchVo 导出查询vo
* @return * @return
*/ */
List<EmployeeRegistrationPreInfoExportVo> selectConfirmExportList(@Param("EmployeeRegistrationPre") EmployeeRegistrationPreSearchVo searchVo); List<EmployeeRegistrationPreInfoExportVo> selectConfirmExportList(@Param("employeeRegistrationPre") EmployeeRegistrationPreSearchVo searchVo);
MessageTempleteVo selectTempleteVo(@Param("id") String id);
} }
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee;
import org.apache.ibatis.annotations.Mapper;
/**
* 入职登记发送短信记录表
*
* @author huych
* @date 2025-03-18 16:54:51
*/
@Mapper
public interface TRegistWarningEmployeeMapper extends BaseMapper<TRegistWarningEmployee> {
}
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre; import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.SendMessageUpdateVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -66,4 +67,20 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr ...@@ -66,4 +67,20 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
* @return * @return
*/ */
R getListCount(EmployeeRegistrationPreSearchVo searchVo); R getListCount(EmployeeRegistrationPreSearchVo searchVo);
/**
* 查询预入职待审核数据
* @param pre 入职待建档表
* @return
*/
R registrationPreAudit(EmployeeRegistrationPre pre);
/**
* 批量发送短信
* @param vo
* @return
*/
R batchSendMessage(SendMessageUpdateVo vo);
void updatePreStatusToEnd(String deptNo, String EmpIdcard);
} }
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee;
/**
* 入职登记发送短信记录表
*
* @author huych
* @date 2025-03-18 16:54:51
*/
public interface TRegistWarningEmployeeService extends IService<TRegistWarningEmployee> {
}
...@@ -111,6 +111,9 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt ...@@ -111,6 +111,9 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
@Lazy @Lazy
private DoJointTask doJointTask; private DoJointTask doJointTask;
@Autowired
private EmployeeRegistrationPreService registrationPreService;
ExecutorService executorService = Executors.newFixedThreadPool(10); ExecutorService executorService = Executors.newFixedThreadPool(10);
public static final String NO_VALID_CONTRACT_FOUND = "未获取到有效在用合同,请确认存在对应姓名、身份证、合同起始时间的合同数据"; public static final String NO_VALID_CONTRACT_FOUND = "未获取到有效在用合同,请确认存在对应姓名、身份证、合同起始时间的合同数据";
...@@ -243,6 +246,8 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt ...@@ -243,6 +246,8 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
// 增-同步处理CSP入离职申请为已处理,加日志 // 增-同步处理CSP入离职申请为已处理,加日志
tEmployeeProjectService.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING); tEmployeeProjectService.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(tEmployeeProject.getDeptNo(),tEmployeeProject.getEmpIdcard());
} }
//判断人员档案的状态,如果是减档状态就复档 //判断人员档案的状态,如果是减档状态就复档
......
...@@ -31,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; ...@@ -31,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpChangeInfoMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpChangeInfoMapper;
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.TSettleDomainMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.EmployeeRegistrationPreService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TCustomerInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TCustomerInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
...@@ -80,6 +81,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -80,6 +81,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
@Autowired @Autowired
private final SocialDaprUtils socialDaprUtils; private final SocialDaprUtils socialDaprUtils;
private final EmployeeRegistrationPreService registrationPreService;
public static final Pattern PATTERN = Pattern.compile("^[-\\+]?[\\d]*$"); public static final Pattern PATTERN = Pattern.compile("^[-\\+]?[\\d]*$");
/** /**
...@@ -186,6 +189,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -186,6 +189,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
huaZhuanProject.setCreateTime(LocalDateTime.now()); huaZhuanProject.setCreateTime(LocalDateTime.now());
huaZhuanProject.setCreateName(user.getNickname()); huaZhuanProject.setCreateName(user.getNickname());
tEmployeeProjectService.doSaveBelongDept(huaZhuanProject, CommonConstants.ONE_STRING); tEmployeeProjectService.doSaveBelongDept(huaZhuanProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(huaZhuanProject.getDeptNo(),huaZhuanProject.getEmpIdcard());
// 减A-同步处理CSP入离职申请为已处理,加日志 // 减A-同步处理CSP入离职申请为已处理,加日志
huaZhuanProject = new TEmployeeProject(); huaZhuanProject = new TEmployeeProject();
...@@ -337,6 +342,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -337,6 +342,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
// 同步CSP // 同步CSP
for (TEmployeeProject add : addCspList) { for (TEmployeeProject add : addCspList) {
tEmployeeProjectService.doSaveBelongDept(add, CommonConstants.ONE_STRING); tEmployeeProjectService.doSaveBelongDept(add, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(add.getDeptNo(),add.getEmpIdcard());
} }
for (TEmployeeProject reduce : reduceCspList) { for (TEmployeeProject reduce : reduceCspList) {
tEmployeeProjectService.doSaveBelongDept(reduce, CommonConstants.TWO_STRING); tEmployeeProjectService.doSaveBelongDept(reduce, CommonConstants.TWO_STRING);
...@@ -683,6 +690,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -683,6 +690,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
tEmployeeProjectService.saveOrUpdate(newEmpProject); tEmployeeProjectService.saveOrUpdate(newEmpProject);
// 增加,同步CSP,下面的减少老项目档案,在方法里有减少CSP // 增加,同步CSP,下面的减少老项目档案,在方法里有减少CSP
tEmployeeProjectService.doSaveBelongDept(newEmpProject, CommonConstants.ONE_STRING); tEmployeeProjectService.doSaveBelongDept(newEmpProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(newEmpProject.getDeptNo(),newEmpProject.getEmpIdcard());
//同步减项老项目档案 //同步减项老项目档案
if (CommonConstants.ONE_STRING.equals(vo.getChangeType())){ if (CommonConstants.ONE_STRING.equals(vo.getChangeType())){
oldEmpProject.setIsLeaveEmployee(CommonConstants.ZERO_INT); oldEmpProject.setIsLeaveEmployee(CommonConstants.ZERO_INT);
......
...@@ -35,11 +35,14 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckBankNo; ...@@ -35,11 +35,14 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckBankNo;
import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard; import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
import com.yifu.cloud.plus.v1.check.entity.TCheckMobile; import com.yifu.cloud.plus.v1.check.entity.TCheckMobile;
import com.yifu.cloud.plus.v1.check.vo.CheckBatchVo; import com.yifu.cloud.plus.v1.check.vo.CheckBatchVo;
import com.yifu.cloud.plus.v1.csp.entity.TOperationLog;
import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants; import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
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.TArchivesLimitMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractAuditMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpDeclarationMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.*; import com.yifu.cloud.plus.v1.yifu.archives.service.*;
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.*; import com.yifu.cloud.plus.v1.yifu.common.core.constant.*;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes; import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
...@@ -48,7 +51,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.ExcelColumnVo; ...@@ -48,7 +51,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.ExcelColumnVo;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.ExcelSheetVo; import com.yifu.cloud.plus.v1.yifu.common.core.vo.ExcelSheetVo;
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.DaprCheckProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCspProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSalaryProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSalaryProperties;
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;
...@@ -74,7 +76,6 @@ import org.springframework.http.HttpHeaders; ...@@ -74,7 +76,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -137,6 +138,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -137,6 +138,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private final TEmpProfessionalQualificationService tEmpProfessionalQualificationService; private final TEmpProfessionalQualificationService tEmpProfessionalQualificationService;
private final TEmpDisabilityInfoService tEmpDisabilityInfoService; private final TEmpDisabilityInfoService tEmpDisabilityInfoService;
private final EmployeeRegistrationPreService registrationPreService;
@Autowired @Autowired
private OSSUtil ossUtil; private OSSUtil ossUtil;
...@@ -635,6 +638,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -635,6 +638,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
// 增-同步处理CSP入离职申请为已处理,加日志 // 增-同步处理CSP入离职申请为已处理,加日志
tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING); tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(project.getDeptNo(),project.getEmpIdcard());
projectNum++; projectNum++;
} }
...@@ -2578,6 +2583,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2578,6 +2583,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
p.setOperationUserName(vo.getCreateName()); p.setOperationUserName(vo.getCreateName());
// hgw加所属部门逻辑: // hgw加所属部门逻辑:
tEmployeeProjectService.doSaveBelongDept(p, CommonConstants.ONE_STRING); tEmployeeProjectService.doSaveBelongDept(p, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(p.getDeptNo(),p.getEmpIdcard());
} }
} }
} }
......
...@@ -122,6 +122,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -122,6 +122,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Autowired @Autowired
private TEmployeeContractAuditService tEmployeeContractAuditService; private TEmployeeContractAuditService tEmployeeContractAuditService;
@Autowired
private EmployeeRegistrationPreService registrationPreService;
@Override @Override
public TSalaryStandardSelectViewVo getUnProjectEmpList(List<TSalaryStandardUnprojectVo> voList) { public TSalaryStandardSelectViewVo getUnProjectEmpList(List<TSalaryStandardUnprojectVo> voList) {
List<TSalaryStandardUnprojectVo> unProjectList = new ArrayList<>(); List<TSalaryStandardUnprojectVo> unProjectList = new ArrayList<>();
...@@ -274,6 +277,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -274,6 +277,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
// 新增,同步CSP // 新增,同步CSP
this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING); this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(tEmployeeProject.getDeptNo(),tEmployeeProject.getEmpIdcard());
if (CommonConstants.ZERO_STRING.equals(tEmployeeProject.getEmpNatrue())) { if (CommonConstants.ZERO_STRING.equals(tEmployeeProject.getEmpNatrue())) {
tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING); tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
...@@ -412,6 +417,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -412,6 +417,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
// 增加,同步CSP // 增加,同步CSP
this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING); this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(tEmployeeProject.getDeptNo(),tEmployeeProject.getEmpIdcard());
TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda() TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getEmpIdcard, tEmployeeProject.getEmpIdcard()) .eq(TEmployeeInfo::getEmpIdcard, tEmployeeProject.getEmpIdcard())
...@@ -456,6 +463,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -456,6 +463,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
// 增加,同步CSP // 增加,同步CSP
this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING); this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(tEmployeeProject.getDeptNo(),tEmployeeProject.getEmpIdcard());
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],
"", empProId, tEmployeeProjectOld, tEmployeeProject); "", empProId, tEmployeeProjectOld, tEmployeeProject);
...@@ -985,6 +994,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -985,6 +994,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
for (TEmployeeProject addProject : proInsList) { for (TEmployeeProject addProject : proInsList) {
// 增加,同步CSP // 增加,同步CSP
this.doSaveBelongDept(addProject, CommonConstants.ONE_STRING); this.doSaveBelongDept(addProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(addProject.getDeptNo(),addProject.getEmpIdcard());
} }
} }
if (!proupdateList.isEmpty()) { if (!proupdateList.isEmpty()) {
...@@ -1352,6 +1363,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1352,6 +1363,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
baseMapper.insert(tEmployeeProject); baseMapper.insert(tEmployeeProject);
// 增加,同步CSP // 增加,同步CSP
this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING); this.doSaveBelongDept(tEmployeeProject, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(tEmployeeProject.getDeptNo(),tEmployeeProject.getEmpIdcard());
} }
/** /**
......
...@@ -165,6 +165,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -165,6 +165,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
private final TArchivesLimitMapper tArchivesLimitMapper; private final TArchivesLimitMapper tArchivesLimitMapper;
private final EmployeeRegistrationPreService registrationPreService;
private final OSSUtil ossUtil; private final OSSUtil ossUtil;
private static final String ID = "id"; private static final String ID = "id";
...@@ -1845,6 +1847,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1845,6 +1847,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (project != null) { if (project != null) {
// 增加,同步CSP // 增加,同步CSP
tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING); tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(project.getDeptNo(),project.getEmpIdcard());
} }
// 更新或新增薪资人员 // 更新或新增薪资人员
// 2024-11-6 16:56:46 新逻辑:在项人员,要更新薪资人员,及时卡号为空也要更新 // 2024-11-6 16:56:46 新逻辑:在项人员,要更新薪资人员,及时卡号为空也要更新
......
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
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.mapper.TRegistWarningEmployeeMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TRegistWarningEmployeeService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
/**
* 入职登记发送短信记录表
*
* @author huych
* @date 2025-03-18 16:54:51
*/
@Log4j2
@Service
public class TRegistWarningEmployeeServiceImpl extends ServiceImpl<TRegistWarningEmployeeMapper, TRegistWarningEmployee> implements TRegistWarningEmployeeService {
}
...@@ -67,6 +67,11 @@ ...@@ -67,6 +67,11 @@
<result property="fileAdress" column="fileAdress"/> <result property="fileAdress" column="fileAdress"/>
</resultMap> </resultMap>
<resultMap id="messageTempleteVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.MessageTempleteVo">
<result property="signName" column="sign_name"/>
<result property="templeteCode" column="model_code"/>
</resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
a.employee_name, a.employee_name,
...@@ -118,7 +123,7 @@ ...@@ -118,7 +123,7 @@
<if test="employeeRegistrationPre.joinLeaveDate != null"> <if test="employeeRegistrationPre.joinLeaveDate != null">
AND a.join_leave_date = #{employeeRegistrationPre.joinLeaveDate} AND a.join_leave_date = #{employeeRegistrationPre.joinLeaveDate}
</if> </if>
<if test="employeeRegistrationPre.statusList != null and employeeRegistrationPre.statusList.trim() != ''"> <if test="employeeRegistrationPre.statusList != null and employeeRegistrationPre.statusList.size() > 0">
AND a.process_status in AND a.process_status in
<foreach item="item" index="index" collection="employeeRegistrationPre.statusList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="employeeRegistrationPre.statusList" open="(" separator="," close=")">
'${item}' '${item}'
...@@ -251,4 +256,12 @@ ...@@ -251,4 +256,12 @@
limit #{employeeRegistrationPre.limitStart},#{employeeRegistrationPre.limitEnd} limit #{employeeRegistrationPre.limitStart},#{employeeRegistrationPre.limitEnd}
</if> </if>
</select> </select>
<select id="selectTempleteVo" resultMap="messageTempleteVoMap">
SELECT
a.model_code,
a.sign_name
from t_message_templete a
where id = #{id}
</select>
</mapper> </mapper>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<if test="employeeRegistrationPre.dataSource != null and employeeRegistrationPre.dataSource.trim() != ''"> <if test="employeeRegistrationPre.dataSource != null and employeeRegistrationPre.dataSource.trim() != ''">
AND a.PROJECT_SOURCE = #{employeeRegistrationPre.dataSource} AND a.PROJECT_SOURCE = #{employeeRegistrationPre.dataSource}
</if> </if>
<if test="employeeRegistration.customerUsernameNew != null and employeeRegistration.customerUsernameNew.trim() != ''"> <if test="employeeRegistrationPre.customerUsernameNew != null and employeeRegistrationPre.customerUsernameNew.trim() != ''">
AND c.CS_NAME = #{employeeRegistration.customerUsernameNew} AND c.CS_NAME = #{employeeRegistration.customerUsernameNew}
</if> </if>
<if test="employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''"> <if test="employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''">
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
a.DEPT_NAME as dept_name, a.DEPT_NAME as dept_name,
a.DEPT_NO as dept_no, a.DEPT_NO as dept_no,
a.CONTRACT_TYPE as contract_type, a.CONTRACT_TYPE as contract_type,
if(a.UNCOMPLETE_TYPE = '1','基本信息',if(a.UNCOMPLETE_TYPE = '2','合同信息','基本信息、合同信息')) as type, a.UNCOMPLETE_TYPE as type,
'1' as process_status, '1' as process_status,
a.ENJOIN_DATE as join_leave_date, a.ENJOIN_DATE as join_leave_date,
a.PROJECT_SOURCE as data_source, a.PROJECT_SOURCE as data_source,
......
<?xml version="1.0" encoding="UTF-8"?>
<!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">
<resultMap id="tRegistWarningEmployeeMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TRegistWarningEmployee">
<id property="id" column="id"/>
<result property="warningId" column="warning_id"/>
<result property="empName" column="emp_name"/>
<result property="empIdcard" column="emp_idcard"/>
<result property="empPhone" column="emp_phone"/>
<result property="sendDate" column="send_date"/>
<result property="bizId" column="biz_id"/>
<result property="sendMethod" column="send_method"/>
<result property="message" column="message"/>
<result property="createBy" column="create_by"/>
<result property="createName" column="create_name"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<sql id="Base_Column_List">
a.id,
a.warning_id,
a.emp_name,
a.emp_idcard,
a.emp_phone,
a.send_date,
a.biz_id,
a.send_method,
a.message,
a.create_by,
a.create_name,
a.create_time,
a.update_by,
a.update_time
</sql>
</mapper>
package com.yifu.cloud.plus.v1.yifu.common.core.util.alisms;
import lombok.Data;
/**
* 入职信息登记封装对象
* @Author huych
* @Date 2025-03-18
* @return
**/
@Data
public class RegistParamVo {
private String name;
private String linkValue;
}
...@@ -135,7 +135,46 @@ public class YiFuSmsUtil { ...@@ -135,7 +135,46 @@ public class YiFuSmsUtil {
return exceptionResult.toJavaObject(QuerySendResult.class); return exceptionResult.toJavaObject(QuerySendResult.class);
} }
} }
public static Map<String,SmsSendDetailDTO> querySendDetails(List<String> phones, String bizId, String sendDate, String pageSize, String curPage){
/**
* 入职登记信息补充提醒短信
* @Author huych
* @Date 2025-03-18
* @param phones
* @param templateParams
* @param signName
* @param templateCode
* @return
* 错误示例 {"Message":"模板不合法(不存在或被拉黑)","RequestId":"D7923A5B-AE30-481C-84D4-56BB0F230848","Code":"isv.SMS_TEMPLATE_ILLEGAL"}
* 正确结果{"Message":"OK","RequestId":"38FA1BE1-52C1-4833-9211-AD55CF264988","BizId":"342207398251524244^0","Code":"OK"}
**/
public static AliSmsResult sendRegistBatchSms(List<String> phones,
List<RegistParamVo> templateParams,
List<String> signName,
String templateCode){
DefaultProfile profile = DefaultProfile.getProfile(REGIONID, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
IAcsClient client = new DefaultAcsClient(profile);
JSONObject exceptionResult = new JSONObject();
CommonRequest request = new CommonRequest();
request.setSysMethod(MethodType.POST);
request.setSysDomain(SYS_DOMAIN);
request.setSysVersion(SYS_VERSION);
request.setSysAction("SendBatchSms");
request.putQueryParameter("PhoneNumberJson", JSONObject.toJSONString(phones));
request.putQueryParameter("SignNameJson", JSONObject.toJSONString(signName));
request.putQueryParameter("TemplateCode", templateCode);
request.putQueryParameter("TemplateParamJson", JSONObject.toJSONString(templateParams));
try {
CommonResponse response = client.getCommonResponse(request);
return JSON.parseObject(response.getData(),AliSmsResult.class);
} catch (Exception e) {
log.error(ERROR_INFO,e);
exceptionResult.put(MESSAGE, ERROR_INFO);
exceptionResult.put(CODE, e.getMessage());
return exceptionResult.toJavaObject(AliSmsResult.class);
}
}
public static Map<String,SmsSendDetailDTO> querySendDetails(List<String> phones, String bizId, String sendDate, String pageSize, String curPage){
DefaultProfile profile = DefaultProfile.getProfile(REGIONID, ACCESS_KEY_ID, ACCESS_KEY_SECRET); DefaultProfile profile = DefaultProfile.getProfile(REGIONID, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
IAcsClient client = new DefaultAcsClient(profile); IAcsClient client = new DefaultAcsClient(profile);
JSONObject exceptionResult = new JSONObject(); JSONObject exceptionResult = new JSONObject();
......
...@@ -43,6 +43,6 @@ public class CspDaprUtils { ...@@ -43,6 +43,6 @@ public class CspDaprUtils {
* @return * @return
**/ **/
public R<EmployeeRegistrationDaprCountVo> getRegisterPreCount(EmployeeRegistrationDaprCountVo countVo) { public R<EmployeeRegistrationDaprCountVo> getRegisterPreCount(EmployeeRegistrationDaprCountVo countVo) {
return HttpDaprUtil.invokeMethodPost(daprCspProperties.getAppUrl(),daprCspProperties.getAppId(),"/employeeregistration/inner/getRegisterPreCount", JSON.toJSONString(countVo), EmployeeRegistrationDaprCountVo.class, SecurityConstants.FROM_IN); return HttpDaprUtil.invokeMethodPost(daprCspProperties.getAppUrl(),daprCspProperties.getAppId(),"/employeeregistration/inner/getRegisterPreCount", countVo, EmployeeRegistrationDaprCountVo.class, SecurityConstants.FROM_IN);
} }
} }
...@@ -223,6 +223,8 @@ public class EmployeeRegistrationController { ...@@ -223,6 +223,8 @@ public class EmployeeRegistrationController {
@Operation(description = "导出入职待确认表") @Operation(description = "导出入职待确认表")
@PostMapping("/hrConfirmExport") @PostMapping("/hrConfirmExport")
public void hrConfirmExport(HttpServletResponse response, @RequestBody EmployeeRegistrationSearchVo searchVo) { public void hrConfirmExport(HttpServletResponse response, @RequestBody EmployeeRegistrationSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
employeeRegistrationService.hrConfirmExport(response, searchVo); employeeRegistrationService.hrConfirmExport(response, searchVo);
} }
......
...@@ -241,9 +241,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -241,9 +241,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
/** /**
* 入离职登记表批量导出 * 入职待确认批量导出
* * @param searchVo 入职待确认
* @param searchVo 入离职登记表
* @return * @return
*/ */
@Override @Override
...@@ -740,20 +739,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -740,20 +739,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
SysCspDeptVo vo = new SysCspDeptVo(); SysCspDeptVo vo = new SysCspDeptVo();
vo.setUserId(user.getId()); vo.setUserId(user.getId());
vo.setProjectId(selectVo.getId()); vo.setProjectId(selectVo.getId());
R<SysCspDeptVo> booleanR = upmsDaprUtils.selectCspDeptByUserDeptId(vo); // 1.9.8: 从客服端导入,入职部门默认为空
if (Common.isNotNull(booleanR) && Common.isNotNull(booleanR.getData()) if(CommonConstants.ONE_STRING.equals(insert.getDataSource())){
&& Common.isNotNull(booleanR.getData().getDepartId()) && Common.isNotNull(booleanR.getData().getDepartName())) { R<SysCspDeptVo> booleanR = upmsDaprUtils.selectCspDeptByUserDeptId(vo);
vo = booleanR.getData(); if (Common.isNotNull(booleanR) && Common.isNotNull(booleanR.getData())
insert.setRegistorDeptname(vo.getDepartName()); && Common.isNotNull(booleanR.getData().getDepartId()) && Common.isNotNull(booleanR.getData().getDepartName())) {
insert.setRegistorDeptid(vo.getDepartId().toString()); vo = booleanR.getData();
insert.setEmpDeptid(vo.getDepartId().toString()); insert.setRegistorDeptname(vo.getDepartName());
insert.setEmpDeptname(vo.getDepartName()); insert.setRegistorDeptid(vo.getDepartId().toString());
} else { insert.setEmpDeptid(vo.getDepartId().toString());
insert.setRegistorDeptname(user.getDeptName()); insert.setEmpDeptname(vo.getDepartName());
insert.setRegistorDeptid(user.getDeptId().toString()); } else {
insert.setEmpDeptid(user.getDeptId().toString()); insert.setRegistorDeptname(user.getDeptName());
insert.setEmpDeptname(user.getDeptName()); insert.setRegistorDeptid(user.getDeptId().toString());
insert.setEmpDeptid(user.getDeptId().toString());
insert.setEmpDeptname(user.getDeptName());
}
} }
insert.setRegistorUsername(user.getNickname()); insert.setRegistorUsername(user.getNickname());
insert.setRegistorPhone(user.getPhone()); insert.setRegistorPhone(user.getPhone());
insert.setCustomerPhone(selectVo.getCsPhone()); insert.setCustomerPhone(selectVo.getCsPhone());
......
...@@ -125,6 +125,9 @@ ...@@ -125,6 +125,9 @@
'${item}' '${item}'
</foreach> </foreach>
</if> </if>
<if test="employeeRegistration.position != null and employeeRegistration.position.trim() != ''">
AND a.position like CONCAT('%',#{employeeRegistration.position},'%')
</if>
<if test="employeeRegistration.typeList != null and employeeRegistration.typeList.size() > 0 "> <if test="employeeRegistration.typeList != null and employeeRegistration.typeList.size() > 0 ">
AND a.feedback_type in AND a.feedback_type in
<foreach item="item" index="index" collection="employeeRegistration.typeList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="employeeRegistration.typeList" open="(" separator="," close=")">
...@@ -298,7 +301,7 @@ ...@@ -298,7 +301,7 @@
a.emp_phone, a.emp_phone,
a.position, a.position,
a.join_leave_date, a.join_leave_date,
if(a.process_status= '0','已接收',if(a.process_status= '1','待处理',if(a.process_status= '2','已处理','拒绝入职')) process_status, if(a.process_status= '0','已接收',if(a.process_status= '1','待处理',if(a.process_status= '2','已处理','拒绝入职'))) process_status,
a.registor_username, a.registor_username,
a.create_time, a.create_time,
a.customer_username_new, a.customer_username_new,
......
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