Commit 9e933b94 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent ab15db5d
...@@ -588,5 +588,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -588,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;
} }
...@@ -843,6 +843,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -843,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(
......
...@@ -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