Commit 42ef22f5 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents 44203f59 d485a2ef
...@@ -18,10 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity; ...@@ -18,10 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
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.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils; import com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...@@ -116,6 +113,7 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -116,6 +113,7 @@ public class TEmpBadRecord extends BaseEntity {
@ExcelAttribute(name = "费用损失", isFloat = true,max = "999999999.99") @ExcelAttribute(name = "费用损失", isFloat = true,max = "999999999.99")
@Schema(description ="费用损失 (费用损失与其他费用损失其一必填)") @Schema(description ="费用损失 (费用损失与其他费用损失其一必填)")
@DecimalMax(value = "999999999.99", message = "费用损失不可大于999999999.99") @DecimalMax(value = "999999999.99", message = "费用损失不可大于999999999.99")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ExcelProperty("费用损失") @ExcelProperty("费用损失")
private BigDecimal loseFee; private BigDecimal loseFee;
...@@ -125,6 +123,7 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -125,6 +123,7 @@ public class TEmpBadRecord extends BaseEntity {
@ExcelAttribute(name = "其他损失" ) @ExcelAttribute(name = "其他损失" )
@Schema(description ="其他损失 (费用损失与其他费用损失其一必填)") @Schema(description ="其他损失 (费用损失与其他费用损失其一必填)")
@DecimalMax(value = "999999999.99", message = "其他损失不可大于999999999.99") @DecimalMax(value = "999999999.99", message = "其他损失不可大于999999999.99")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ExcelProperty("其他损失") @ExcelProperty("其他损失")
private BigDecimal loseFeeOther; private BigDecimal loseFeeOther;
......
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