Commit 93a08997 authored by hongguangwu's avatar hongguangwu

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

parents 54ad9e91 9e933b94
...@@ -17,4 +17,5 @@ public class EmployeeInfoMsgVo implements Serializable { ...@@ -17,4 +17,5 @@ public class EmployeeInfoMsgVo implements Serializable {
private String card; private String card;
private String phone; private String phone;
private String message; private String message;
private String detailId;
} }
...@@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -33,9 +32,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -33,9 +32,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/** /**
* 项目编码 * 项目编码
*/ */
@NotBlank(message = "项目编码 不能为空")
@Length(max = 30, message = "项目编码 不能超过30 个字符") @Length(max = 30, message = "项目编码 不能超过30 个字符")
@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码 不能为空", maxLength = 30) @ExcelAttribute(name = "项目编码", maxLength = 30)
@Schema(description = "项目编码") @Schema(description = "项目编码")
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
private String deptNo; private String deptNo;
...@@ -58,9 +56,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -58,9 +56,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/** /**
* 身份证号 * 身份证号
*/ */
@NotBlank(message = "身份证号 不能为空")
@Length(max = 18, message = "身份证号 不能超过18 个字符") @Length(max = 18, message = "身份证号 不能超过18 个字符")
@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号 不能为空", maxLength = 18) @ExcelAttribute(name = "身份证号", maxLength = 18)
@Schema(description = "身份证号") @Schema(description = "身份证号")
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
private String empIdcard; private String empIdcard;
...@@ -231,8 +228,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -231,8 +228,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/** /**
* 合同年限 * 合同年限
*/ */
@NotBlank(message = "合同年限不能为空") @ExcelAttribute(name = "合同年限")
@ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空")
@Schema(description = "合同年限") @Schema(description = "合同年限")
private String contractTerm; private String contractTerm;
...@@ -592,5 +588,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -592,5 +588,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@Schema(description = "是否撤销签署0是1否") @Schema(description = "是否撤销签署0是1否")
private String signFlag; private String signFlag;
@Schema(description = "撤销签署原因")
private String revokeReason;
} }
...@@ -198,4 +198,17 @@ public class EmployeeRegistrationPreController { ...@@ -198,4 +198,17 @@ public class EmployeeRegistrationPreController {
public R<EmployeeInfoMsgVo> getEmployeeInfo(@RequestParam String id) { public R<EmployeeInfoMsgVo> getEmployeeInfo(@RequestParam String id) {
return employeeRegistrationPreService.getEmployeeInfo(id); return employeeRegistrationPreService.getEmployeeInfo(id);
} }
/**
* 查询身份信息
*
* @author huych
* @date 2025-03-13 16:55:32
**/
@Operation(summary = "查询瓜子身份信息")
@SysLog("查询身份信息")
@GetMapping("/getGzEmployeeInfo")
public R<EmployeeInfoMsgVo> getGzEmployeeInfo(@RequestParam String id) {
return employeeRegistrationPreService.getGzEmployeeInfo(id);
}
} }
...@@ -93,7 +93,7 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr ...@@ -93,7 +93,7 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
R<EmployeeInfoMsgVo> getEmployeeInfo(String cardOrId); R<EmployeeInfoMsgVo> getEmployeeInfo(String cardOrId);
R<EmployeeInfoMsgVo> getGzEmployeeInfo(String cardOrId);
/** /**
* @param empIdCard 身份证 * @param empIdCard 身份证
......
...@@ -101,6 +101,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -101,6 +101,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
private final TEmployeeContractPreMapper contractPreMapper; private final TEmployeeContractPreMapper contractPreMapper;
private final TGzOfferInfoMapper gzOfferInfoMapper;
@Autowired @Autowired
@Lazy @Lazy
private ScheduleService scheduleService; private ScheduleService scheduleService;
...@@ -841,6 +843,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -841,6 +843,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
employeeContractPreVo.setCreateName(user.getNickname()); employeeContractPreVo.setCreateName(user.getNickname());
// 设置更新者ID // 设置更新者ID
employeeContractPreVo.setUpdateBy(user.getId()); employeeContractPreVo.setUpdateBy(user.getId());
//是否撤销签署
employeeContractPreVo.setSignFlag(CommonConstants.ONE_STRING);
employeeContractPreVo.setRevokeReason(CommonConstants.EMPTY_STRING);
// 预计提醒时间、预计合同发起时间 // 预计提醒时间、预计合同发起时间
try { try {
employeeContractPreVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( employeeContractPreVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
...@@ -1185,6 +1190,27 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -1185,6 +1190,27 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return R.failed(CommonConstants.NO_DATA_TO_HANDLE); return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
} }
@Override
public R<EmployeeInfoMsgVo> getGzEmployeeInfo(String id) {
//获取人员档案id
EmployeeInfoMsgVo msgInfoVo = baseMapper.getEmployeeArchivesInfo(id);
if (Common.isEmpty(msgInfoVo)) {
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
}
//获取预入职信息,如果有的话提示
if (Common.isNotNull(msgInfoVo) && Common.isNotNull(msgInfoVo.getDetailId())) {
TGzOfferInfo empMain = gzOfferInfoMapper.selectOne(Wrappers.<TGzOfferInfo>query().lambda()
.eq(TGzOfferInfo::getId, Integer.valueOf(msgInfoVo.getDetailId()))
.ne(TGzOfferInfo::getOfferStatus, CommonConstants.NINE_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(empMain)) {
msgInfoVo.setMessage("当前Offer不符合档案采集状态,禁止操作");
}
return R.ok(msgInfoVo);
}
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
/** /**
* @Description: 获取前端客服的所有项目权限 * @Description: 获取前端客服的所有项目权限
* @Author: huych * @Author: huych
......
...@@ -54,6 +54,7 @@ security: ...@@ -54,6 +54,7 @@ security:
- /tpreempmain/sendCode - /tpreempmain/sendCode
- /tpreempmain/checkCode - /tpreempmain/checkCode
- /employeeregistrationpre/getEmployeeInfo - /employeeregistrationpre/getEmployeeInfo
- /employeeregistrationpre/getGzEmployeeInfo
- /employeeregistrationpre/judgeIsSimple - /employeeregistrationpre/judgeIsSimple
- /tgzempinfo/getInfoByOfferId - /tgzempinfo/getInfoByOfferId
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
<result property="name" column="name"/> <result property="name" column="name"/>
<result property="card" column="card"/> <result property="card" column="card"/>
<result property="phone" column="phone"/> <result property="phone" column="phone"/>
<result property="detailId" column="detailId"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -315,7 +316,8 @@ ...@@ -315,7 +316,8 @@
a.emp_idcard as card, a.emp_idcard as card,
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,
a.warning_id as detailId
from t_registe_warning_employee a from t_registe_warning_employee a
where a.id = #{id} where a.id = #{id}
</select> </select>
......
...@@ -622,4 +622,17 @@ public class ArchivesDaprUtil { ...@@ -622,4 +622,17 @@ public class ArchivesDaprUtil {
public R<Boolean> selectExitEmpCopntract(TEmployeeAutoRegistCheckVo cardVo) { public R<Boolean> selectExitEmpCopntract(TEmployeeAutoRegistCheckVo cardVo) {
return HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeecontractinfo/inner/selectExitEmpCopntract", JSON.toJSONString(cardVo), Boolean.class, SecurityConstants.FROM_IN); return HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeecontractinfo/inner/selectExitEmpCopntract", JSON.toJSONString(cardVo), Boolean.class, SecurityConstants.FROM_IN);
} }
/**
* @Author huyc
* @Description 新增合同待签订信息
* @Date 10:36 2025/6/19
* @Param
* @return
**/
public R<Boolean> saveContractPreInfo(TEmployeeContractPreVo preVo) {
return HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),
"/temployeecontractpre/inner/saveContractPreInfo", JSON.toJSONString(preVo), Boolean.class, SecurityConstants.FROM_IN);
}
} }
...@@ -706,6 +706,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -706,6 +706,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo.setCreateName(user.getNickname()); employeeContractPreVo.setCreateName(user.getNickname());
// 设置更新者ID // 设置更新者ID
employeeContractPreVo.setUpdateBy(user.getId()); employeeContractPreVo.setUpdateBy(user.getId());
//是否撤销签署
employeeContractPreVo.setSignFlag(CommonConstants.ONE_STRING);
employeeContractPreVo.setRevokeReason(CommonConstants.EMPTY_STRING);
//预计确认提醒时间、预计合同发起时间日期赋值 //预计确认提醒时间、预计合同发起时间日期赋值
R<TEmployeeInsuranceWorkDayVo> dataR; R<TEmployeeInsuranceWorkDayVo> dataR;
if (Common.isNotNull(employeeContractPreVo.getRegistType()) if (Common.isNotNull(employeeContractPreVo.getRegistType())
...@@ -794,6 +797,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -794,6 +797,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 9:00", DateUtil.DATETIME_PATTERN_MINUTE)); employeeContractPreVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 9:00", DateUtil.DATETIME_PATTERN_MINUTE));
employeeContractPreVo.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString( employeeContractPreVo.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
employeeContractPreVo.getExpectedConfirmTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 8:30", DateUtil.DATETIME_PATTERN_MINUTE)); employeeContractPreVo.getExpectedConfirmTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 8:30", DateUtil.DATETIME_PATTERN_MINUTE));
archivesDaprUtil.saveContractPreInfo(employeeContractPreVo);
} }
......
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