Commit 6f540bcf authored by hongguangwu's avatar hongguangwu

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

parents 5abe14e2 e4e1175f
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
import java.util.Date;
/**
* @Author fxj
* @Date 2022/7/1
* @Description
* @Version 1.0
*/
@Data
public class ContractAlertConfirmResVo implements Serializable {
@ExcelAttribute(name = "项目名称")
@Schema(description = "项目名称")
@ExcelProperty("项目名称")
private String deptName;
@ExcelAttribute(name = "项目编码")
@Schema(description = "项目编码")
@ExcelProperty("项目编码")
private String deptNo;
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelAttribute(name = "主键" )
@Schema(description ="主键")
@ExcelIgnore
private String id;
/**
* 员工名称
*/
@ExcelAttribute(name = "员工名称" )
@Schema(description ="员工名称")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工名称")
private String empName;
/**
* 身份证号
*/
@ExcelAttribute(name = "身份证号" )
@Schema(description ="身份证号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("身份证号")
private String empIdcard;
/**
* 上一份合同起止日期
*/
@Schema(description = "上一份合同起止日期")
private String lastContractEndAndStart;
/**
* 就职岗位
*/
@ExcelAttribute(name = "就职岗位" )
@Schema(description ="就职岗位")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("就职岗位")
private String post;
/**
* 合同类型
*/
@ExcelAttribute(name = "合同类型" )
@Schema(description ="合同类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同类型")
private String contractType;
/**
* 签署甲方
*/
@ExcelAttribute(name = "签署甲方", maxLength = 50)
@Length(max = 50, message = "签署甲方不能超过50个字符")
@ExcelProperty("签署甲方")
@Schema(description = "签署甲方")
private String signatory;
/**
* 签署方式
*/
@ExcelAttribute(name = "签署方式", maxLength = 32)
@ExcelProperty("签署方式")
@Schema(description = "签署方式1线下签0电子签")
private String signType;
/**
* 合同开始日期
*/
@ExcelAttribute(name = "合同开始日期" )
@Schema(description ="合同开始日期")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同开始日期")
private Date contractStart;
/**
* 合同截止日期
*/
@ExcelAttribute(name = "合同截止日期" )
@Schema(description ="合同截止日期")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同截止日期")
private Date contractEnd;
/**
* 合同截止日期-续签
*/
@ExcelAttribute(name = "合同截止日期-续签" )
@Schema(description ="合同截止日期-续签")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同截止日期-续签")
private Date contractEndNew;
/**
* 合同开始日期-续签
*/
@ExcelAttribute(name = "合同开始日期-续签" )
@Schema(description ="合同开始日期-续签")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同开始日期-续签")
private Date contractStartNew;
/**
* 合同ID
*/
@ExcelAttribute(name = "合同ID" , isExport = false)
@Schema(description ="合同ID")
@ExcelIgnore
private String contractId;
@ExcelAttribute(name = "错误信息")
@Schema(description = "错误信息")
@ExcelProperty("错误信息")
private String errorMsg;
}
...@@ -125,4 +125,23 @@ public class ContractAlertConfirmVo implements Serializable { ...@@ -125,4 +125,23 @@ public class ContractAlertConfirmVo implements Serializable {
@ExcelIgnore @ExcelIgnore
private String contractId; private String contractId;
@ExcelAttribute(name = "项目名称")
@Schema(description = "项目名称")
@ExcelProperty("项目名称")
private String deptName;
@ExcelAttribute(name = "项目编码")
@Schema(description = "项目编码")
@ExcelProperty("项目编码")
private String deptNo;
@ExcelAttribute(name = "错误信息")
@Schema(description = "错误信息")
@ExcelProperty("错误信息")
private String errorMsg;
} }
...@@ -47,4 +47,7 @@ public class TEmployeeAutoRegistCheckVo implements Serializable { ...@@ -47,4 +47,7 @@ public class TEmployeeAutoRegistCheckVo implements Serializable {
@ExcelProperty("错误信息") @ExcelProperty("错误信息")
private String errorMsg; private String errorMsg;
//反馈文件要求
ContractAlertConfirmResVo confirmVo;
} }
...@@ -721,4 +721,10 @@ public class TEmployeeContractPreNewVo extends TEmployeeContractPreNew implement ...@@ -721,4 +721,10 @@ public class TEmployeeContractPreNewVo extends TEmployeeContractPreNew implement
**/ **/
private List<String> contractIds; private List<String> contractIds;
/**
* @Author fxj
* @Description 批量确认返回对象
**/
private List<ContractAlertConfirmResVo> confirmVos;
} }
...@@ -107,4 +107,8 @@ public class EmployeeConstants { ...@@ -107,4 +107,8 @@ public class EmployeeConstants {
public static final String DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR = "待续签合同超期一个月,需走线下签"; public static final String DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR = "待续签合同超期一个月,需走线下签";
public static final String ERROR_TYPE_CONTRACT = "合同";
public static final String ERROR_DUPLICATE_CONFIRM = "已确认,请勿重复确认";
public static final String ERROR_NO_ALERT_FOUND = "未找到合同续签待办信息";
} }
...@@ -1059,7 +1059,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1059,7 +1059,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//更新合同提醒办理状态 //更新合同提醒办理状态
LambdaUpdateWrapper<TEmpContractAlert> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmpContractAlert> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmpContractAlert::getContractId, contractPreNew.getContractId()) updateWrapper.eq(TEmpContractAlert::getContractId, contractPreNew.getContractId())
.eq(TEmpContractAlert::getHandleStatus, CommonConstants.ZERO_STRING); .set(TEmpContractAlert::getHandleStatus, CommonConstants.ZERO_STRING);
contractAlertMapper.update(null, updateWrapper);
} }
} }
if (EmployeeConstants.SITUATION_SEVEN.equals(contractInfo.getSituation())) { if (EmployeeConstants.SITUATION_SEVEN.equals(contractInfo.getSituation())) {
......
...@@ -147,6 +147,8 @@ public class DoFascTask { ...@@ -147,6 +147,8 @@ public class DoFascTask {
preNew.setSignFlag(CommonConstants.ZERO_STRING); preNew.setSignFlag(CommonConstants.ZERO_STRING);
preNew.setRevokeReason(Common.isEmpty(terminationNote)?CommonConstants.EMPTY_STRING:terminationNote); preNew.setRevokeReason(Common.isEmpty(terminationNote)?CommonConstants.EMPTY_STRING:terminationNote);
tEmployeeContractPreNewService.updateById(preNew); tEmployeeContractPreNewService.updateById(preNew);
//更新合同待办
tEmployeeContractPreNewService.updateByIdAndUpdateAlert(preNew);
} }
//如果存在合同申请审核数据,将状态更新成5撤销签署 //如果存在合同申请审核数据,将状态更新成5撤销签署
contractInfo.setAuditStatus(CommonConstants.FIVE_INT); contractInfo.setAuditStatus(CommonConstants.FIVE_INT);
...@@ -178,9 +180,10 @@ public class DoFascTask { ...@@ -178,9 +180,10 @@ public class DoFascTask {
contractAutoLog.setMainId(preNew.getId()); contractAutoLog.setMainId(preNew.getId());
contractAutoLog.setErrorInfo(null == terminationNote ? "法大大签署失败" : terminationNote); contractAutoLog.setErrorInfo(null == terminationNote ? "法大大签署失败" : terminationNote);
contractAutoLogService.save(contractAutoLog); contractAutoLogService.save(contractAutoLog);
//更新合同待办
tEmployeeContractPreNewService.updateByIdAndUpdateAlert(preNew);
//签署失败发送企微消息 //签署失败发送企微消息
sendFddFalureInfoToWx(preNew, contractAutoLog.getId()); sendFddFalureInfoToWx(preNew, contractAutoLog.getId());
// 加日志 // 加日志
this.saveAuditLogFail("签署失败", terminationNote,contractInfo.getId()); this.saveAuditLogFail("签署失败", terminationNote,contractInfo.getId());
pushLog.setReturnData("签署任务参与方签署失败事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent); pushLog.setReturnData("签署任务参与方签署失败事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
...@@ -492,7 +495,7 @@ public class DoFascTask { ...@@ -492,7 +495,7 @@ public class DoFascTask {
StringBuilder description = new StringBuilder(); StringBuilder description = new StringBuilder();
String title = "作业自动化——电子合同续签失败提醒"; String title = "作业自动化——电子合同续签失败提醒";
description.append(pre.getEmployeeName() + "-" + pre.getEmpIdcard() + "-" + pre.getEmpPhone() + description.append(pre.getEmployeeName() + "-" + pre.getEmpIdcard() + "-" + pre.getEmpPhone() +
",电子合同签署失败").append("<br>"); ",电子合同续签失败").append("<br>");
description.append("请及时处理,以免产生用工风险!").append("<br>"); description.append("请及时处理,以免产生用工风险!").append("<br>");
textcard.put("title", title); textcard.put("title", title);
textcard.put("url", authUrl); textcard.put("url", authUrl);
......
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