Commit f6d55681 authored by hongguangwu's avatar hongguangwu

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

parents ff31d2c2 f6623f35
...@@ -19,10 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity; ...@@ -19,10 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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;
...@@ -542,6 +539,7 @@ public class TEmployeeContractPreNew extends BaseEntity { ...@@ -542,6 +539,7 @@ public class TEmployeeContractPreNew extends BaseEntity {
/** /**
* 异常原因说明 * 异常原因说明
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ExcelAttribute(name = "异常原因说明", maxLength = 200) @ExcelAttribute(name = "异常原因说明", maxLength = 200)
@Length(max = 200, message = "异常原因说明不能超过200个字符") @Length(max = 200, message = "异常原因说明不能超过200个字符")
@ExcelProperty("异常原因说明") @ExcelProperty("异常原因说明")
...@@ -574,6 +572,7 @@ public class TEmployeeContractPreNew extends BaseEntity { ...@@ -574,6 +572,7 @@ public class TEmployeeContractPreNew extends BaseEntity {
/** /**
* 发起失败时间 * 发起失败时间
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ExcelAttribute(name = "发起失败时间", isDate = true) @ExcelAttribute(name = "发起失败时间", isDate = true)
@ExcelProperty("发起失败时间") @ExcelProperty("发起失败时间")
@Schema(description = "发起失败时间") @Schema(description = "发起失败时间")
......
...@@ -1183,17 +1183,14 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -1183,17 +1183,14 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
//处理成功更新数据 //处理成功更新数据
EmployeeContractVO contractVO = disList.stream().filter(vo -> Objects.equals(vo.getRowIndex(), errorMessage.getLineNum())).collect(Collectors.toList()).get(0); EmployeeContractVO contractVO = disList.stream().filter(vo -> Objects.equals(vo.getRowIndex(), errorMessage.getLineNum())).collect(Collectors.toList()).get(0);
// 先查询旧状态,判断是否需要清空错误信息 // 先查询旧状态,判断是否需要清空错误信息
TEmployeeContractPreNew oldPre = baseMapper.selectById(contractVO.getPreNewId());
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPreNew::getId, contractVO.getPreNewId()) updateWrapper.eq(TEmployeeContractPreNew::getId, contractVO.getPreNewId())
.in(TEmployeeContractPreNew::getProcessStatus, CommonConstants.contractDIsStatus) .in(TEmployeeContractPreNew::getProcessStatus, CommonConstants.contractDIsStatus)
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.TWO_STRING) .set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.TWO_STRING)
.set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING); .set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING);
// 如果之前是发起失败状态,清空错误信息 // 如果之前是发起失败状态,清空错误信息
if (Common.isNotNull(oldPre) && CommonConstants.FIVE_STRING.equals(oldPre.getProcessStatus())) {
updateWrapper.set(TEmployeeContractPreNew::getErrorInfo, null) updateWrapper.set(TEmployeeContractPreNew::getErrorInfo, null)
.set(TEmployeeContractPreNew::getErrorTime, null); .set(TEmployeeContractPreNew::getErrorTime, null);
}
this.update(updateWrapper); this.update(updateWrapper);
//更新合同的办理状态 //更新合同的办理状态
......
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