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
1973fd17
Commit
1973fd17
authored
May 14, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-薪资导入的表格类型
parent
af9f7238
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
2 deletions
+20
-2
TSalaryStandard.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
+8
-0
SalaryUploadParamVo.java
...ifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadParamVo.java
+2
-0
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+3
-1
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+1
-0
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+6
-1
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
View file @
1973fd17
...
...
@@ -466,6 +466,14 @@ public class TSalaryStandard extends BaseEntity {
@Schema
(
description
=
"业务类型三级分类"
)
private
String
businessThirdType
;
/**
* 表格类型 0 薪资原表 1 系统模板
*/
@ExcelAttribute
(
name
=
"表格类型 0 薪资原表 1 系统模板"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"表格类型 0 薪资原表 1 系统模板"
)
private
String
excelType
;
/**
* 工资月份-起
*/
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadParamVo.java
View file @
1973fd17
...
...
@@ -42,4 +42,6 @@ public class SalaryUploadParamVo {
// 数据行,从0开始计数的
Integer
dataNum
;
// 表格类型 0 薪资原表 1 系统模板
String
excelType
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
1973fd17
...
...
@@ -349,7 +349,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
}
}
if
(
salary
!=
null
)
{
if
(
Common
.
isNotNull
(
vo
.
getExcelType
()))
{
salary
.
setExcelType
(
vo
.
getExcelType
());
}
// 薪资导入、删除前加锁:
TSalaryLock
lock
=
salaryLockService
.
lambdaQuery
()
.
eq
(
TSalaryLock:
:
getDeptId
,
dept
.
getId
())
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
1973fd17
...
...
@@ -1012,6 +1012,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
// 最后转化为jsonString
jsonString
=
JSON
.
toJSON
(
contentList
).
toString
();
SalaryUploadParamVo
returnVo
=
new
SalaryUploadParamVo
();
returnVo
.
setExcelType
(
CommonConstants
.
ZERO_STRING
);
returnVo
.
setDataNum
(
vo
.
getDataNum
());
returnVo
.
setCheckList
(
checkList
);
returnVo
.
setJsonString
(
jsonString
);
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
1973fd17
...
...
@@ -84,6 +84,7 @@
<result
property=
"setId"
column=
"SET_ID"
/>
<result
property=
"deleteUser"
column=
"DELETE_USER"
/>
<result
property=
"deleteDate"
column=
"DELETE_DATE"
/>
<result
property=
"excelType"
column=
"EXCEL_TYPE"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -145,7 +146,8 @@
a.INCOME_MONTH,
a.SET_ID,
a.DELETE_USER,
a.DELETE_DATE
a.DELETE_DATE,
a.EXCEL_TYPE
</sql>
<sql
id=
"tSalaryStandard_where"
>
<if
test=
"tSalaryStandard != null"
>
...
...
@@ -293,6 +295,9 @@
<if
test=
"tSalaryStandard.isDiff != null and tSalaryStandard.isDiff.trim() != ''"
>
AND a.IS_DIFF = #{tSalaryStandard.isDiff}
</if>
<if
test=
"tSalaryStandard.excelType != null and tSalaryStandard.excelType.trim() != ''"
>
AND a.EXCEL_TYPE = #{tSalaryStandard.excelType}
</if>
</if>
</sql>
<!--tSalaryStandard简单分页查询-->
...
...
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