Commit 070e0679 authored by fangxinjiang's avatar fangxinjiang

附属信息调整

parent f62f15bb
...@@ -23,10 +23,13 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -23,10 +23,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.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;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.DecimalMax;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -94,7 +97,7 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -94,7 +97,7 @@ public class TEmpBadRecord extends BaseEntity {
/** /**
* 发生时间 * 发生时间
*/ */
@ExcelAttribute(name = "发生时间" ) @ExcelAttribute(name = "发生时间",isDate = true, dateFormat = LocalDateTimeUtils.DATE_TIME_PATTERN_DEFAULT)
@Schema(description ="发生时间") @Schema(description ="发生时间")
@ExcelProperty("发生时间") @ExcelProperty("发生时间")
private Date happenTime; private Date happenTime;
...@@ -102,16 +105,17 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -102,16 +105,17 @@ public class TEmpBadRecord extends BaseEntity {
/** /**
* 备注 * 备注
*/ */
@ExcelAttribute(name = "备注", maxLength = 200) @ExcelAttribute(name = "不良记录描述", maxLength = 200)
@Schema(description ="备注") @Schema(description ="不良记录描述")
@ExcelProperty("备注") @ExcelProperty("不良记录描述")
private String remark; private String remark;
/** /**
* 费用损失 (费用损失与其他费用损失其一必填) * 费用损失 (费用损失与其他费用损失其一必填)
*/ */
@ExcelAttribute(name = "费用损失 " ) @ExcelAttribute(name = "费用损失", isFloat = true,max = (float)999999999.99)
@Schema(description ="费用损失 (费用损失与其他费用损失其一必填)") @Schema(description ="费用损失 (费用损失与其他费用损失其一必填)")
@DecimalMax(value = "999999999.99", message = "费用损失不可大于999999999.99")
@ExcelProperty("费用损失") @ExcelProperty("费用损失")
private BigDecimal loseFee; private BigDecimal loseFee;
...@@ -120,6 +124,7 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -120,6 +124,7 @@ public class TEmpBadRecord extends BaseEntity {
*/ */
@ExcelAttribute(name = "其他损失" ) @ExcelAttribute(name = "其他损失" )
@Schema(description ="其他损失 (费用损失与其他费用损失其一必填)") @Schema(description ="其他损失 (费用损失与其他费用损失其一必填)")
@DecimalMax(value = "999999999.99", message = "其他损失不可大于999999999.99")
@ExcelProperty("其他损失") @ExcelProperty("其他损失")
private BigDecimal loseFeeOther; private BigDecimal loseFeeOther;
......
...@@ -68,7 +68,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable { ...@@ -68,7 +68,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable {
/** /**
* 费用损失 (费用损失与其他费用损失其一必填) * 费用损失 (费用损失与其他费用损失其一必填)
*/ */
@ExcelAttribute(name = "费用损失 " ) @ExcelAttribute(name = "费用损失" , isFloat = true,max = (float)999999999.99)
@Schema(description ="费用损失 (费用损失与其他费用损失其一必填)") @Schema(description ="费用损失 (费用损失与其他费用损失其一必填)")
@ExcelProperty("费用损失") @ExcelProperty("费用损失")
private BigDecimal loseFee; private BigDecimal loseFee;
...@@ -76,7 +76,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable { ...@@ -76,7 +76,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable {
/** /**
* 其他损失 (费用损失与其他费用损失其一必填) * 其他损失 (费用损失与其他费用损失其一必填)
*/ */
@ExcelAttribute(name = "其他损失" ) @ExcelAttribute(name = "其他损失" , isFloat = true,max = (float)999999999.99)
@Schema(description ="其他损失 (费用损失与其他费用损失其一必填)") @Schema(description ="其他损失 (费用损失与其他费用损失其一必填)")
@ExcelProperty("其他损失") @ExcelProperty("其他损失")
private BigDecimal loseFeeOther; private BigDecimal loseFeeOther;
......
...@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -101,7 +102,7 @@ public class TEmpBadRecordController { ...@@ -101,7 +102,7 @@ public class TEmpBadRecordController {
@SysLog("新增员工不良记录" ) @SysLog("新增员工不良记录" )
@PostMapping @PostMapping
@PreAuthorize("@pms.hasPermission('demo_tempbadrecord_add')" ) @PreAuthorize("@pms.hasPermission('demo_tempbadrecord_add')" )
public R<Boolean> save(@RequestBody TEmpBadRecord tEmpBadRecord) { public R<Boolean> save(@Valid @RequestBody TEmpBadRecord tEmpBadRecord) {
return tEmpBadRecordService.saveDiy(tEmpBadRecord); return tEmpBadRecordService.saveDiy(tEmpBadRecord);
} }
...@@ -114,7 +115,7 @@ public class TEmpBadRecordController { ...@@ -114,7 +115,7 @@ public class TEmpBadRecordController {
@SysLog("修改员工不良记录" ) @SysLog("修改员工不良记录" )
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('demo_tempbadrecord_edit')" ) @PreAuthorize("@pms.hasPermission('demo_tempbadrecord_edit')" )
public R<Boolean> updateById(@RequestBody TEmpBadRecord tEmpBadRecord) { public R<Boolean> updateById(@Valid @RequestBody TEmpBadRecord tEmpBadRecord) {
return R.ok(tEmpBadRecordService.updateById(tEmpBadRecord)); return R.ok(tEmpBadRecordService.updateById(tEmpBadRecord));
} }
......
...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.common.core.constant; ...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.common.core.constant;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.math.BigDecimal;
/** /**
* @Description Excel配置注解自定义接口 * @Description Excel配置注解自定义接口
......
...@@ -664,6 +664,8 @@ public class ExcelUtil <T> implements Serializable { ...@@ -664,6 +664,8 @@ public class ExcelUtil <T> implements Serializable {
if (Double.doubleToLongBits(Double.valueOf(c).doubleValue()) > Double.doubleToLongBits(attr.max())) { if (Double.doubleToLongBits(Double.valueOf(c).doubleValue()) > Double.doubleToLongBits(attr.max())) {
return errorInfo(attr, "_超出最大值", i); return errorInfo(attr, "_超出最大值", i);
} }
}else if (attr.isFloat() && Float.compare(Float.valueOf(c),attr.max()) > 0){
return errorInfo(attr, "_超出最大值", i);
}else{ }else{
if (Float.valueOf(c).intValue() > attr.max()) { if (Float.valueOf(c).intValue() > attr.max()) {
return errorInfo(attr, "_超出最大值", i); return errorInfo(attr, "_超出最大值", i);
......
...@@ -92,7 +92,7 @@ archives.import.emp.email.length=\u90AE\u7BB1\u4E0D\u53EF\u8D85\u8FC750\u5B57 ...@@ -92,7 +92,7 @@ archives.import.emp.email.length=\u90AE\u7BB1\u4E0D\u53EF\u8D85\u8FC750\u5B57
import.file.type.error=\u5BFC\u5165\u7684\u6587\u4EF6\u683C\u5F0F\u4E0D\u6B63\u786E import.file.type.error=\u5BFC\u5165\u7684\u6587\u4EF6\u683C\u5F0F\u4E0D\u6B63\u786E
archives.project.emp.not.exist=\u5BF9\u5E94\u9879\u76EE\u7F16\u7801\u65E0\u9879\u76EE\u6863\u6848\u4FE1\u606F\uFF0C\u8BF7\u6838\u5B9E\u540E\u5BFC\u5165 archives.project.emp.not.exist=\u8BE5\u4EBA\u5458\u65E0\u5BF9\u5E94\u7684\u9879\u76EE\u6863\u6848\u4FE1\u606F\uFF0C\u8BF7\u6838\u5B9E\u540E\u5BFC\u5165
archives.project.change.not.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B58\u5728\u8FDB\u884C\u4E2D/\u672A\u5B8C\u7ED3\u7684\u670D\u52A1 archives.project.change.not.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B58\u5728\u8FDB\u884C\u4E2D/\u672A\u5B8C\u7ED3\u7684\u670D\u52A1
......
...@@ -62,7 +62,7 @@ public class BaseEntity implements Serializable { ...@@ -62,7 +62,7 @@ public class BaseEntity implements Serializable {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新时间") @Schema(description = "更新时间")
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
@ExcelProperty("更新时间") @ExcelIgnore
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }
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