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
bcaf7cd3
Commit
bcaf7cd3
authored
Aug 11, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
1bac909d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
78 additions
and
34 deletions
+78
-34
TSalaryAccount.java
...yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
+15
-15
TSocialFundInfo.java
...ifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
+5
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+58
-19
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
View file @
bcaf7cd3
...
...
@@ -110,28 +110,28 @@ public class TSalaryAccount {
@ExcelProperty
(
"开户行总行"
)
private
String
bankName
;
/**
*
结算部门
id
*
项目
id
*/
@ExcelAttribute
(
name
=
"
结算部门id"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门
id不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"
结算部门
id不能为空"
)
@Length
(
max
=
32
,
message
=
"
结算部门
id不能超过32个字符"
)
@ExcelProperty
(
"
结算部门
id"
)
@ExcelAttribute
(
name
=
"
项目id"
,
isNotEmpty
=
true
,
errorInfo
=
"项目
id不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"
项目
id不能为空"
)
@Length
(
max
=
32
,
message
=
"
项目
id不能超过32个字符"
)
@ExcelProperty
(
"
项目
id"
)
private
String
deptId
;
/**
*
结算部门
no
*
项目
no
*/
@ExcelAttribute
(
name
=
"
结算部门no"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门
no不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
结算部门no
不能为空"
)
@Length
(
max
=
50
,
message
=
"
结算部门no
不能超过50个字符"
)
@ExcelProperty
(
"
结算部门no
"
)
@ExcelAttribute
(
name
=
"
项目编码"
,
isNotEmpty
=
true
,
errorInfo
=
"项目
no不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
项目编码
不能为空"
)
@Length
(
max
=
50
,
message
=
"
项目编码
不能超过50个字符"
)
@ExcelProperty
(
"
项目编码
"
)
private
String
deptNo
;
/**
*
结算部门
name
*
项目
name
*/
@ExcelAttribute
(
name
=
"
结算部门name"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门
name不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
结算部门name
不能为空"
)
@Length
(
max
=
50
,
message
=
"
结算部门name
不能超过50个字符"
)
@ExcelProperty
(
"
结算部门name
"
)
@ExcelAttribute
(
name
=
"
项目名称"
,
isNotEmpty
=
true
,
errorInfo
=
"项目
name不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
项目名称
不能为空"
)
@Length
(
max
=
50
,
message
=
"
项目名称
不能超过50个字符"
)
@ExcelProperty
(
"
项目名称
"
)
private
String
deptName
;
/**
* 工资发放方式(0现金/1银行)/2线下
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @
bcaf7cd3
...
...
@@ -1043,4 +1043,9 @@ public class TSocialFundInfo extends BaseEntity {
// 执行月份,整体调基使用的
@TableField
(
exist
=
false
)
private
String
doMonth
;
// 基数配置,户调基使用的
@TableField
(
exist
=
false
)
private
SysBaseSetInfo
socialSetInfo
;
@TableField
(
exist
=
false
)
private
SysBaseSetInfo
fundSetInfo
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
bcaf7cd3
This diff is collapsed.
Click to expand it.
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