Commit 2f194677 authored by fangxinjiang's avatar fangxinjiang

自动化失败原因、失败时间、定时任务等调整-fxj

parent 97e86693
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...@@ -87,7 +88,8 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -87,7 +88,8 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "发起失败时间") @Schema(description = "发起失败时间")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
private Date errorTime; @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime errorTime;
@Schema(description = "法大大模版名称") @Schema(description = "法大大模版名称")
private String fadadaTemplate; private String fadadaTemplate;
......
...@@ -31,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; ...@@ -31,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
/** /**
...@@ -576,7 +577,7 @@ public class TEmployeeContractPreNew extends BaseEntity { ...@@ -576,7 +577,7 @@ public class TEmployeeContractPreNew extends BaseEntity {
@ExcelAttribute(name = "发起失败时间", isDate = true) @ExcelAttribute(name = "发起失败时间", isDate = true)
@ExcelProperty("发起失败时间") @ExcelProperty("发起失败时间")
@Schema(description = "发起失败时间") @Schema(description = "发起失败时间")
private Date errorTime; private LocalDateTime errorTime;
/** /**
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义 * 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
......
...@@ -14,6 +14,7 @@ import lombok.Data; ...@@ -14,6 +14,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
/** /**
...@@ -384,7 +385,7 @@ public class ContractAlertAutoVo extends TEmpContractAlert implements Serializab ...@@ -384,7 +385,7 @@ public class ContractAlertAutoVo extends TEmpContractAlert implements Serializab
@ExcelAttribute(name = "发起失败时间", isDate = true) @ExcelAttribute(name = "发起失败时间", isDate = true)
@ExcelProperty("发起失败时间") @ExcelProperty("发起失败时间")
@Schema(description = "发起失败时间") @Schema(description = "发起失败时间")
private Date errorTime; private LocalDateTime errorTime;
/** /**
* 异常原因说明 * 异常原因说明
......
...@@ -316,4 +316,13 @@ public class TEmpContractAlertExportVo { ...@@ -316,4 +316,13 @@ public class TEmpContractAlertExportVo {
@Schema(description = "前端客服") @Schema(description = "前端客服")
private String csName; private String csName;
/**
* 异常原因说明
*/
@ExcelAttribute(name = "异常原因说明", maxLength = 200)
@Length(max = 200, message = "异常原因说明不能超过200个字符")
@ExcelProperty("异常原因说明")
@Schema(description = "异常原因说明")
private String errorInfo;
} }
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -20,31 +21,37 @@ public class TEmployeeContractPreExportVo implements Serializable { ...@@ -20,31 +21,37 @@ public class TEmployeeContractPreExportVo implements Serializable {
@ExcelAttribute(name = "项目名称") @ExcelAttribute(name = "项目名称")
@Schema(description = "项目名称") @Schema(description = "项目名称")
@ExcelProperty("项目名称") @ExcelProperty("项目名称")
@HeadFontStyle(fontHeightInPoints = 11)
private String deptName; private String deptName;
@ExcelAttribute(name = "项目编码") @ExcelAttribute(name = "项目编码")
@Schema(description = "项目编码") @Schema(description = "项目编码")
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
@HeadFontStyle(fontHeightInPoints = 11)
private String deptNo; private String deptNo;
@ExcelAttribute(name = "员工姓名") @ExcelAttribute(name = "员工姓名")
@Schema(description = "员工姓名") @Schema(description = "员工姓名")
@ExcelProperty("员工姓名") @ExcelProperty("员工姓名")
@HeadFontStyle(fontHeightInPoints = 11)
private String employeeName; private String employeeName;
@ExcelAttribute(name = "身份证号") @ExcelAttribute(name = "身份证号")
@Schema(description = "身份证号") @Schema(description = "身份证号")
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
@HeadFontStyle(fontHeightInPoints = 11)
private String empIdcard; private String empIdcard;
@ExcelAttribute(name = "手机号码") @ExcelAttribute(name = "手机号码")
@Schema(description = "手机号码") @Schema(description = "手机号码")
@ExcelProperty("手机号码") @ExcelProperty("手机号码")
@HeadFontStyle(fontHeightInPoints = 11)
private String empPhone; private String empPhone;
@ExcelAttribute(name = "就职岗位") @ExcelAttribute(name = "就职岗位")
@Schema(description = "就职岗位") @Schema(description = "就职岗位")
@ExcelProperty("就职岗位") @ExcelProperty("就职岗位")
@HeadFontStyle(fontHeightInPoints = 11)
private String position; private String position;
/** /**
...@@ -53,31 +60,37 @@ public class TEmployeeContractPreExportVo implements Serializable { ...@@ -53,31 +60,37 @@ public class TEmployeeContractPreExportVo implements Serializable {
@ExcelAttribute(name = "入职日期") @ExcelAttribute(name = "入职日期")
@Schema(description = "入职日期") @Schema(description = "入职日期")
@ExcelProperty("入职日期") @ExcelProperty("入职日期")
@HeadFontStyle(fontHeightInPoints = 11)
private String joinLeaveDate; private String joinLeaveDate;
@ExcelAttribute(name = "合同类型") @ExcelAttribute(name = "合同类型")
@Schema(description = "合同类型") @Schema(description = "合同类型")
@ExcelProperty("合同类型") @ExcelProperty("合同类型")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractType; private String contractType;
@ExcelAttribute(name = "签署甲方") @ExcelAttribute(name = "签署甲方")
@Schema(description = "签署甲方") @Schema(description = "签署甲方")
@ExcelProperty("签署甲方") @ExcelProperty("签署甲方")
@HeadFontStyle(fontHeightInPoints = 11)
private String signatory; private String signatory;
@ExcelAttribute(name = "前端客服") @ExcelAttribute(name = "前端客服")
@Schema(description = "前端客服") @Schema(description = "前端客服")
@ExcelProperty("前端客服") @ExcelProperty("前端客服")
@HeadFontStyle(fontHeightInPoints = 11)
private String customerUsername; private String customerUsername;
@ExcelAttribute(name = "签署方式") @ExcelAttribute(name = "签署方式")
@Schema(description = "签署方式") @Schema(description = "签署方式")
@ExcelProperty("签署方式") @ExcelProperty("签署方式")
@HeadFontStyle(fontHeightInPoints = 11)
private String signType; private String signType;
@ExcelAttribute(name = "法大大模版名称") @ExcelAttribute(name = "法大大模版名称")
@Schema(description = "法大大模版名称") @Schema(description = "法大大模版名称")
@ExcelProperty("法大大模版名称") @ExcelProperty("法大大模版名称")
@HeadFontStyle(fontHeightInPoints = 11)
private String fadadaTemplate; private String fadadaTemplate;
/** /**
...@@ -86,6 +99,7 @@ public class TEmployeeContractPreExportVo implements Serializable { ...@@ -86,6 +99,7 @@ public class TEmployeeContractPreExportVo implements Serializable {
@ExcelAttribute(name = "预计确认时间") @ExcelAttribute(name = "预计确认时间")
@Schema(description = "预计确认时间") @Schema(description = "预计确认时间")
@ExcelProperty("预计确认时间") @ExcelProperty("预计确认时间")
@HeadFontStyle(fontHeightInPoints = 11)
private String expectedConfirmTime; private String expectedConfirmTime;
/** /**
* 预计发起时间 * 预计发起时间
...@@ -93,15 +107,24 @@ public class TEmployeeContractPreExportVo implements Serializable { ...@@ -93,15 +107,24 @@ public class TEmployeeContractPreExportVo implements Serializable {
@ExcelAttribute(name = "预计发起时间") @ExcelAttribute(name = "预计发起时间")
@Schema(description = "预计发起时间") @Schema(description = "预计发起时间")
@ExcelProperty("预计发起时间") @ExcelProperty("预计发起时间")
@HeadFontStyle(fontHeightInPoints = 11)
private String expectedCollectionTime; private String expectedCollectionTime;
@ExcelAttribute(name = "状态") @ExcelAttribute(name = "状态")
@Schema(description = "状态") @Schema(description = "状态")
@ExcelProperty("状态") @ExcelProperty("状态")
@HeadFontStyle(fontHeightInPoints = 11)
private String processStatus; private String processStatus;
@ExcelAttribute(name = "是否已建档") @ExcelAttribute(name = "是否已建档")
@Schema(description = "是否已建档") @Schema(description = "是否已建档")
@ExcelProperty("是否已建档") @ExcelProperty("是否已建档")
@HeadFontStyle(fontHeightInPoints = 11)
private String archivesIsCreate; private String archivesIsCreate;
@ExcelAttribute(name = "发起失败原因")
@ExcelProperty("发起失败原因")
@Schema(description = "发起失败原因")
@HeadFontStyle(fontHeightInPoints = 11)
private String errorInfo;
} }
...@@ -33,6 +33,7 @@ import org.hibernate.validator.constraints.Length; ...@@ -33,6 +33,7 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -578,7 +579,7 @@ public class TEmployeeContractPreNewVo extends TEmployeeContractPreNew implement ...@@ -578,7 +579,7 @@ public class TEmployeeContractPreNewVo extends TEmployeeContractPreNew implement
@ExcelAttribute(name = "发起失败时间", isDate = true) @ExcelAttribute(name = "发起失败时间", isDate = true)
@ExcelProperty("发起失败时间") @ExcelProperty("发起失败时间")
@Schema(description = "发起失败时间") @Schema(description = "发起失败时间")
private Date errorTime; private LocalDateTime errorTime;
/** /**
* 合同截止日期类型 0 合同年限推算 1 同商务合同一致 2 工作任务完成时止 3 指定日期 * 合同截止日期类型 0 合同年限推算 1 同商务合同一致 2 工作任务完成时止 3 指定日期
*/ */
......
...@@ -1054,7 +1054,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1054,7 +1054,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (Common.isNotNull(contractPreNew)) { if (Common.isNotNull(contractPreNew)) {
contractPreNew.setProcessStatus(CommonConstants.THREE_STRING); contractPreNew.setProcessStatus(CommonConstants.THREE_STRING);
contractPreNew.setErrorInfo(tEmployeeContractInfo.getAuditRemark()); contractPreNew.setErrorInfo(tEmployeeContractInfo.getAuditRemark());
contractPreNew.setErrorTime(new Date()); contractPreNew.setErrorTime(LocalDateTime.now());
contractPreNewMapper.updateById(contractPreNew); contractPreNewMapper.updateById(contractPreNew);
//更新合同提醒办理状态 //更新合同提醒办理状态
LambdaUpdateWrapper<TEmpContractAlert> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmpContractAlert> updateWrapper = new LambdaUpdateWrapper<>();
...@@ -2299,7 +2299,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -2299,7 +2299,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (Common.isNotNull(contractPreNew)) { if (Common.isNotNull(contractPreNew)) {
contractPreNew.setProcessStatus(CommonConstants.THREE_STRING); contractPreNew.setProcessStatus(CommonConstants.THREE_STRING);
contractPreNew.setErrorInfo(tEmployeeContractInfo.getAuditRemark()); contractPreNew.setErrorInfo(tEmployeeContractInfo.getAuditRemark());
contractPreNew.setErrorTime(new Date()); contractPreNew.setErrorTime(LocalDateTime.now());
contractPreNewMapper.updateById(contractPreNew); contractPreNewMapper.updateById(contractPreNew);
//更新合同提醒办理状态为待处理 //更新合同提醒办理状态为待处理
LambdaUpdateWrapper<TEmpContractAlert> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmpContractAlert> updateWrapper = new LambdaUpdateWrapper<>();
......
...@@ -61,6 +61,7 @@ import java.io.IOException; ...@@ -61,6 +61,7 @@ import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -826,7 +827,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -826,7 +827,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
// 更新processStatus为电子签发起失败 // 更新processStatus为电子签发起失败
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId()) updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId())
.set(TEmployeeContractPreNew::getErrorTime, new Date()) .set(TEmployeeContractPreNew::getErrorTime, LocalDateTime.now())
.set(TEmployeeContractPreNew::getErrorInfo, "系统自动撤销签署须走线下签!"); .set(TEmployeeContractPreNew::getErrorInfo, "系统自动撤销签署须走线下签!");
this.update(updateWrapper); this.update(updateWrapper);
...@@ -864,7 +865,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -864,7 +865,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId()) updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId())
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPreNew::getErrorInfo, EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO) .set(TEmployeeContractPreNew::getErrorInfo, EmployeeConstants.DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO)
.set(TEmployeeContractPreNew::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPreNew::getErrorTime, LocalDateTime.now());
this.update(updateWrapper); this.update(updateWrapper);
if ("2".equals(type)) { if ("2".equals(type)) {
...@@ -905,7 +906,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -905,7 +906,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId()) updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId())
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPreNew::getErrorInfo, errorMsg) .set(TEmployeeContractPreNew::getErrorInfo, errorMsg)
.set(TEmployeeContractPreNew::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPreNew::getErrorTime, LocalDateTime.now());
this.update(updateWrapper); this.update(updateWrapper);
if ("2".equals(type)) { if ("2".equals(type)) {
...@@ -952,7 +953,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -952,7 +953,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
updateWrapper.eq(TEmployeeContractPreNew::getId, contractPreTemp.getId()) updateWrapper.eq(TEmployeeContractPreNew::getId, contractPreTemp.getId())
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPreNew::getErrorInfo, errorMsg) .set(TEmployeeContractPreNew::getErrorInfo, errorMsg)
.set(TEmployeeContractPreNew::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPreNew::getErrorTime, LocalDateTime.now());
this.update(updateWrapper); this.update(updateWrapper);
// 更新合同: // 更新合同:
if (Common.isNotNull(contractPreTemp.getId())) { if (Common.isNotNull(contractPreTemp.getId())) {
...@@ -1089,7 +1090,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -1089,7 +1090,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING) .set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING)
.set(TEmployeeContractPreNew::getErrorInfo, errorMessage.getMessage()) .set(TEmployeeContractPreNew::getErrorInfo, errorMessage.getMessage())
.set(TEmployeeContractPreNew::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPreNew::getErrorTime, LocalDateTime.now());
// 执行更新操作 // 执行更新操作
errorMessage.setData(backInfoMap.get(contractVO.getPreNewId())); errorMessage.setData(backInfoMap.get(contractVO.getPreNewId()));
this.update(updateWrapper); this.update(updateWrapper);
......
package com.yifu.cloud.plus.v1.yifu.archives.service.impl; package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
...@@ -38,6 +39,7 @@ import javax.servlet.ServletOutputStream; ...@@ -38,6 +39,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -368,7 +370,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -368,7 +370,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.set(TEmployeeContractPre::getChangeTypeReason, "已超过入职日期一个月,自动转线下签") .set(TEmployeeContractPre::getChangeTypeReason, "已超过入职日期一个月,自动转线下签")
.set(TEmployeeContractPre::getChangeTypeTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())) .set(TEmployeeContractPre::getChangeTypeTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now()))
.set(TEmployeeContractPre::getSignType, CommonConstants.ONE_STRING) .set(TEmployeeContractPre::getSignType, CommonConstants.ONE_STRING)
.set(TEmployeeContractPre::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPre::getErrorTime, LocalDateTime.now());
this.update(updateWrapper); this.update(updateWrapper);
if ("2".equals(type)) { if ("2".equals(type)) {
...@@ -409,7 +411,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -409,7 +411,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
updateWrapper.eq(TEmployeeContractPre::getId, contractPre.getId()) updateWrapper.eq(TEmployeeContractPre::getId, contractPre.getId())
.set(TEmployeeContractPre::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPre::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPre::getErrorInfo, errorMsg) .set(TEmployeeContractPre::getErrorInfo, errorMsg)
.set(TEmployeeContractPre::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPre::getErrorTime, LocalDateTime.now());
this.update(updateWrapper); this.update(updateWrapper);
if ("2".equals(type)) { if ("2".equals(type)) {
...@@ -457,7 +459,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -457,7 +459,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
updateWrapper.eq(TEmployeeContractPre::getId, contractPre.getId()) updateWrapper.eq(TEmployeeContractPre::getId, contractPre.getId())
.set(TEmployeeContractPre::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPre::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPre::getErrorInfo, errorMsg) .set(TEmployeeContractPre::getErrorInfo, errorMsg)
.set(TEmployeeContractPre::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPre::getErrorTime, LocalDateTime.now());
this.update(updateWrapper); this.update(updateWrapper);
// 更新合同: // 更新合同:
if (Common.isNotNull(contract.getContractId())) { if (Common.isNotNull(contract.getContractId())) {
...@@ -575,7 +577,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -575,7 +577,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.set(TEmployeeContractPre::getProcessStatus, CommonConstants.FIVE_STRING) .set(TEmployeeContractPre::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPre::getSignType, CommonConstants.ONE_STRING) .set(TEmployeeContractPre::getSignType, CommonConstants.ONE_STRING)
.set(TEmployeeContractPre::getErrorInfo, errorMessage.getMessage()) .set(TEmployeeContractPre::getErrorInfo, errorMessage.getMessage())
.set(TEmployeeContractPre::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TEmployeeContractPre::getErrorTime, LocalDateTime.now());
// 执行更新操作 // 执行更新操作
errorMessage.setData(contractVO); errorMessage.setData(contractVO);
this.update(updateWrapper); this.update(updateWrapper);
......
...@@ -20,6 +20,7 @@ import org.springframework.security.core.authority.AuthorityUtils; ...@@ -20,6 +20,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
/** /**
...@@ -161,7 +162,7 @@ public class DoFascTask { ...@@ -161,7 +162,7 @@ public class DoFascTask {
// 3:签署任务参与方签署失败事件 // 3:签署任务参与方签署失败事件
preNew.setProcessStatus(CommonConstants.dingleDigitStrArray[7]); preNew.setProcessStatus(CommonConstants.dingleDigitStrArray[7]);
preNew.setErrorInfo(Common.isEmpty(terminationNote)?CommonConstants.EMPTY_STRING:terminationNote); preNew.setErrorInfo(Common.isEmpty(terminationNote)?CommonConstants.EMPTY_STRING:terminationNote);
preNew.setErrorTime(new Date()); preNew.setErrorTime(LocalDateTime.now());
preNew.setRequestId(""); preNew.setRequestId("");
tEmployeeContractPreNewService.updateById(preNew); tEmployeeContractPreNewService.updateById(preNew);
......
...@@ -396,7 +396,8 @@ ...@@ -396,7 +396,8 @@
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
b.EXPECTED_COLLECTION_TIME, b.EXPECTED_COLLECTION_TIME,
b.SIGN_TYPE, b.SIGN_TYPE,
IFNULL(b.PROCESS_STATUS,'0') PROCESS_STATUS IFNULL(b.PROCESS_STATUS,'0') PROCESS_STATUS,
case when PROCESS_STATUS='5' then b.error_info else '' end as error_info
FROM t_emp_contract_alert a FROM t_emp_contract_alert a
LEFT JOIN t_employee_contract_pre_new b on a.CONTRACT_ID = b.contract_id LEFT JOIN t_employee_contract_pre_new b on a.CONTRACT_ID = b.contract_id
<where> <where>
......
...@@ -367,7 +367,9 @@ ...@@ -367,7 +367,9 @@
WHEN a.process_status =10 THEN "撤销签署-客服撤销" WHEN a.process_status =10 THEN "撤销签署-客服撤销"
WHEN a.process_status =11 THEN "撤销签署-系统自动撤销" WHEN a.process_status =11 THEN "撤销签署-系统自动撤销"
ELSE a.process_status END as process_status, ELSE a.process_status END as process_status,
if(b.id is null,'否','是') archives_is_create if(b.id is null,'否','是') archives_is_create,
CASE WHEN a.process_status=5 THEN a.error_info
ELSE "" end as error_info
FROM t_employee_contract_pre a FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0' and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
......
...@@ -129,4 +129,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable { ...@@ -129,4 +129,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable {
@ExcelProperty("状态") @ExcelProperty("状态")
private String processStatus; private String processStatus;
@ExcelAttribute(name = "发起失败原因")
@ExcelProperty("发起失败原因")
@Schema(description = "发起失败原因")
private String errorInfo;
} }
...@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo; ...@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -106,4 +107,8 @@ public class TInsuranceAlertExportVO { ...@@ -106,4 +107,8 @@ public class TInsuranceAlertExportVO {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "前端客服") @ExcelProperty(value = "前端客服")
private String customerUsername; private String customerUsername;
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "失败原因")
private String errorInfo;
} }
...@@ -309,7 +309,9 @@ ...@@ -309,7 +309,9 @@
WHEN a.buy_type='3' THEN "批增" WHEN a.buy_type='3' THEN "批增"
WHEN a.buy_type ='4' THEN "替换" WHEN a.buy_type ='4' THEN "替换"
ELSE a.buy_type END as buy_type, ELSE a.buy_type END as buy_type,
if(a.is_address = '0','是',if(a.is_address = '1','否','')) as is_address if(a.is_address = '0','是',if(a.is_address = '1','否','')) as is_address,
CASE WHEN a.process_status ='2' THEN error_info
ELSE "" END as error_info
FROM t_employee_insurance_pre a FROM t_employee_insurance_pre a
<where> <where>
1=1 and a.IS_REFUSE = '1' 1=1 and a.IS_REFUSE = '1'
......
...@@ -427,7 +427,8 @@ ...@@ -427,7 +427,8 @@
,DATE_FORMAT(b.expected_collection_time,'%Y-%m-%d %H:%i') expected_collection_time ,DATE_FORMAT(b.expected_collection_time,'%Y-%m-%d %H:%i') expected_collection_time
,case b.process_status when '0' then '待确认' when '1' then '待派单' when '2' then '派单失败' ,case b.process_status when '0' then '待确认' when '1' then '待派单' when '2' then '派单失败'
when '3' then '待投保' when '4' then '投保中' when '5' then '投保退回' when '6' then '已投保' when '7' then '待缴费' else '-' end process_status when '3' then '待投保' when '4' then '投保中' when '5' then '投保退回' when '6' then '已投保' when '7' then '待缴费' else '-' end process_status
,b.CUSTOMER_USERNAME ,b.CUSTOMER_USERNAME,
case b.process_status when '2' then b.error_info else '' end error_info
FROM t_insurance_alert a FROM t_insurance_alert a
JOIN t_insurance_pre_renew_detail b ON a.INSURANCES_PRE_RENEW_DETAIL_ID = b.ID JOIN t_insurance_pre_renew_detail b ON a.INSURANCES_PRE_RENEW_DETAIL_ID = b.ID
<where> <where>
......
...@@ -598,7 +598,8 @@ public class TDispatchInfoPre extends BaseEntity { ...@@ -598,7 +598,8 @@ public class TDispatchInfoPre extends BaseEntity {
@Schema(description = "发起失败时间") @Schema(description = "发起失败时间")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
private Date errorTime; @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime errorTime;
@Schema(description = "派单审核/办理不通过原因") @Schema(description = "派单审核/办理不通过原因")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
......
...@@ -167,4 +167,14 @@ public class TDispatchInfoPreExportVo implements Serializable { ...@@ -167,4 +167,14 @@ public class TDispatchInfoPreExportVo implements Serializable {
@Schema(description = "大病起缴日期") @Schema(description = "大病起缴日期")
private String bigailmentStart; private String bigailmentStart;
/**
* 发起失败原因
*/
@ExcelAttribute(name = "发起失败原因", maxLength = 500)
@Schema(description = "发起失败原因")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(25)
@ExcelProperty("发起失败原因")
private String errorInfo;
} }
...@@ -139,9 +139,20 @@ public class TDispatchInfoPreFundExportVo implements Serializable { ...@@ -139,9 +139,20 @@ public class TDispatchInfoPreFundExportVo implements Serializable {
* 起缴日期 (公积金起缴日期) * 起缴日期 (公积金起缴日期)
*/ */
@ExcelAttribute(name = "公积金起缴日期", isDate = true) @ExcelAttribute(name = "公积金起缴日期", isDate = true)
@Schema(description = "起缴日期(公积金起缴日期)") @Schema(description = "起缴日期 (公积金起缴日期)")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(15) @ColumnWidth(15)
@ExcelProperty("公积金起缴日期") @ExcelProperty("公积金起缴日期")
private String fundStartDate; private String fundStartDate;
/**
* 发起失败原因
*/
@ExcelAttribute(name = "发起失败原因", maxLength = 500)
@Schema(description = "发起失败原因")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(25)
@ExcelProperty("发起失败原因")
private String errorInfo;
} }
...@@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.ParseException; import java.text.ParseException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.*; import java.util.*;
...@@ -522,7 +523,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -522,7 +523,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("1","2","4","8","9")) .in(TDispatchInfoPre::getProcessStatus, Arrays.asList("1","2","4","8","9"))
.set(TDispatchInfoPre::getProcessStatus, CommonConstants.TWO_STRING) .set(TDispatchInfoPre::getProcessStatus, CommonConstants.TWO_STRING)
.set(TDispatchInfoPre::getErrorInfo, errorMessage.getMessage()) .set(TDispatchInfoPre::getErrorInfo, errorMessage.getMessage())
.set(TDispatchInfoPre::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TDispatchInfoPre::getErrorTime, LocalDateTime.now());
// 执行更新操作 // 执行更新操作
errorMessage.setData(contractVO); errorMessage.setData(contractVO);
this.update(updateWrapper); this.update(updateWrapper);
...@@ -827,7 +828,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -827,7 +828,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("1","2","4","8")) .in(TDispatchInfoPre::getProcessStatus, Arrays.asList("1","2","4","8"))
.set(TDispatchInfoPre::getProcessStatus, CommonConstants.TWO_STRING) .set(TDispatchInfoPre::getProcessStatus, CommonConstants.TWO_STRING)
.set(TDispatchInfoPre::getErrorInfo, errorMessage.getMessage()) .set(TDispatchInfoPre::getErrorInfo, errorMessage.getMessage())
.set(TDispatchInfoPre::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now())); .set(TDispatchInfoPre::getErrorTime, LocalDateTime.now());
// 执行更新操作 // 执行更新操作
errorMessage.setData(contractVO); errorMessage.setData(contractVO);
this.update(updateWrapper); this.update(updateWrapper);
......
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
<result property="birthStart" column="BIRTH_START"/> <result property="birthStart" column="BIRTH_START"/>
<result property="bigailmentStart" column="BIGAILMENT_START"/> <result property="bigailmentStart" column="BIGAILMENT_START"/>
<result property="errorInfo" column="error_info"/>
</resultMap> </resultMap>
...@@ -133,6 +134,8 @@ ...@@ -133,6 +134,8 @@
<result property="contractStatus" column="CONTRACT_STATUS"/> <result property="contractStatus" column="CONTRACT_STATUS"/>
<result property="fundStartDate" column="FUND_START_DATE"/> <result property="fundStartDate" column="FUND_START_DATE"/>
<result property="errorInfo" column="error_info"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -543,7 +546,8 @@ ...@@ -543,7 +546,8 @@
a.WORK_INJURY_START, a.WORK_INJURY_START,
a.UNEMPLOY_START, a.UNEMPLOY_START,
a.BIRTH_START, a.BIRTH_START,
a.BIGAILMENT_START a.BIGAILMENT_START,
CASE WHEN a.process_status = '2' THEN a.error_info ELSE '' END as error_info
FROM t_dispatch_info_pre a FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
<where> <where>
...@@ -581,7 +585,8 @@ ...@@ -581,7 +585,8 @@
ELSE a.process_status END as process_status, ELSE a.process_status END as process_status,
a.expected_collection_time, a.expected_collection_time,
a.customer_username, a.customer_username,
a.FUND_START_DATE a.FUND_START_DATE,
CASE WHEN a.process_status = '2' THEN a.error_info ELSE '' END as error_info
FROM t_dispatch_info_pre a FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
<where> <where>
...@@ -597,7 +602,75 @@ ...@@ -597,7 +602,75 @@
<!--tDispatchInfoPre c端不分页查询--> <!--tDispatchInfoPre c端不分页查询-->
<select id="geNoPageList" resultMap="tDispatchInfoPreMap"> <select id="geNoPageList" resultMap="tDispatchInfoPreMap">
SELECT SELECT
<include refid="Base_Column_List"/> a.ID,
a.EMP_NAME,
a.EMP_IDCARD,
a.PROCESS_STATUS,
a.DEPT_ID,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.FUND_PROVINCE,
a.FUND_CITY,
a.FUND_TOWN,
a.DISPATCH_ITEM,
a.DEPT_NAME,
a.DEPT_NO,
a.PROVIDENT_HOUSEHOLD_NAME,
a.SOCIAL_HOUSEHOLD_NAME,
a.TYPE_SUB,
a.RECEIVE_TYPE,
a.RECORD_BASE,
a.RECORD_BASE_TYPE,
a.JOIN_LEAVE_DATE,
a.CUSTOMER_USERNAME,
a.CUSTOMER_USER_LOGIN_NAME,
a.EXPECTED_COLLECTION_TIME,
a.EXPECTED_CONFIRM_TIME,
a.IS_AUTO_DIS,
a.IS_CREATE_DATE,
a.CONFIG_NAME,
a.CONFIG_ID,
a.REGISTER_ID,
a.PENSION_START,
a.MEDICAL_START,
a.UNEMPLOY_START,
a.SOCIAL_START_DATE,
a.WORK_INJURY_START,
a.BIRTH_START,
a.BIGAILMENT_START,
a.TRUST_REMARK,
a.PENSION_CARDINAL,
a.MEDICAL_CARDINAL,
a.UNEMPLOYMENT_CARDINAL,
a.BIGAILMENT_CARDINAL,
a.WORK_INJURY_CARDINAL,
a.BIRTH_CARDINAL,
a.PAYMENT_TYPE,
a.CONTRACT_ID,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.UPDATE_TIME,
a.CREATE_TIME,
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info,a.position,SOCIAL_FUND_ID,a.phone,
a.SOCIAL_PROVINCE_ID,a.SOCIAL_CITY_ID,a.SOCIAL_TOWN_ID
,a.UP_PERSION,
a.UP_MEDICAL,
a.UP_UNEMPLOYMENT,
a.UP_INJURY,
a.UP_BIRTH,
a.UP_BIG,
a.LOWER_PERSION,
a.LOWER_MEDICAL,
a.LOWER_UNEMPLOYMENT,
a.LOWER_INJURY,
a.LOWER_BIRTH,
a.LOWER_BIG,
a.PROVIDENT_CARDINAL,
a.UNIT_PROVIDENT_PER,
a.PERSONAL_PROVIDENT_PER,
a.CONFIG_HOUSE_ID
,if(b.EMP_IDCARD is not null,'0','1') as CONTRACT_STATUS,a.FUND_START_DATE ,if(b.EMP_IDCARD is not null,'0','1') as CONTRACT_STATUS,a.FUND_START_DATE
FROM t_dispatch_info_pre a FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
......
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