Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
070e0679
Commit
070e0679
authored
Jul 07, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
附属信息调整
parent
f62f15bb
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
11 deletions
+20
-11
TEmpBadRecord.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmpBadRecord.java
+10
-5
EmpBadRecordVo.java
...m/yifu/cloud/plus/v1/yifu/archives/vo/EmpBadRecordVo.java
+2
-2
TEmpBadRecordController.java
.../v1/yifu/archives/controller/TEmpBadRecordController.java
+3
-2
ExcelAttribute.java
...oud.plus.v1/yifu/common/core/constant/ExcelAttribute.java
+1
-0
ExcelUtil.java
...m/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
+2
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+1
-1
BaseEntity.java
...fu.cloud.plus.v1/yifu/common/mybatis/base/BaseEntity.java
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpBadRecord.java
View file @
070e0679
...
@@ -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
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpBadRecordVo.java
View file @
070e0679
...
@@ -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
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpBadRecordController.java
View file @
070e0679
...
@@ -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
));
}
}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttribute.java
View file @
070e0679
...
@@ -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配置注解自定义接口
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
View file @
070e0679
...
@@ -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
);
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
070e0679
...
@@ -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
=
\u
5BFC
\u5165\u7684\u6587\u
4EF6
\u
683C
\u
5F0F
\u
4E0D
\u
6B63
\u
786E
import.file.type.error
=
\u
5BFC
\u5165\u7684\u6587\u
4EF6
\u
683C
\u
5F0F
\u
4E0D
\u
6B63
\u
786E
archives.project.emp.not.exist
=
\u
5BF9
\u
5E94
\u9879\u
76EE
\u
7F16
\u7801\u
65E0
\u9879\u
76EE
\u6863\u6848\u
4FE1
\u
606F
\u
FF0C
\u
8BF7
\u6838\u
5B9E
\u
540E
\u
5BFC
\u5165
archives.project.emp.not.exist
=
\u
8BE5
\u
4EBA
\u5458\u
65E0
\u
5BF9
\u
5E94
\u7684
\u9879\u
76EE
\u6863\u6848\u
4FE1
\u
606F
\u
FF0C
\u
8BF7
\u6838\u
5B9E
\u
540E
\u
5BFC
\u5165
archives.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u
8FDB
\u
884C
\u
4E2D/
\u
672A
\u
5B8C
\u
7ED3
\u7684\u
670D
\u
52A1
archives.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u
8FDB
\u
884C
\u
4E2D/
\u
672A
\u
5B8C
\u
7ED3
\u7684\u
670D
\u
52A1
...
...
yifu-common/yifu-common-mybatis/src/main/java/com/yifu.cloud.plus.v1/yifu/common/mybatis/base/BaseEntity.java
View file @
070e0679
...
@@ -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
)
@Excel
Property
(
"更新时间"
)
@Excel
Ignore
private
LocalDateTime
updateTime
;
private
LocalDateTime
updateTime
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment