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
8929255f
Commit
8929255f
authored
Mar 06, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
0790a308
69db0e32
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
57 additions
and
48 deletions
+57
-48
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+42
-40
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+6
-5
SalaryAccountExportVo.java
...u/cloud/plus/v1/yifu/salary/vo/SalaryAccountExportVo.java
+6
-0
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+1
-1
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
8929255f
...
...
@@ -2094,6 +2094,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
**/
@Override
public
void
doSaveBelongDept
(
TEmployeeProject
p
,
String
feedbackType
)
{
if
(
p
!=
null
)
{
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
=
new
TEmployeeProjectBelongDeptSearchCspVo
();
searchCspVo
.
setDeptId
(
p
.
getDeptId
());
searchCspVo
.
setEmpIdCard
(
p
.
getEmpIdcard
());
...
...
@@ -2138,5 +2139,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
8929255f
...
...
@@ -1822,7 +1822,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmployeeProjectService
.
updateById
(
project
);
}
else
{
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
project
=
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
}
}
else
{
// 新建档案、项目档案,将档案id赋值,给其他附属信息
...
...
@@ -1835,16 +1835,17 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId
=
emp
.
getId
();
empIdCard
=
emp
.
getEmpIdcard
();
// 2项目档案
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
project
=
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
}
}
if
(
emp
==
null
)
{
return
R
.
failed
(
"新建员工失败!"
);
}
if
(
project
!=
null
)
{
// 增加,同步CSP
tEmployeeProjectService
.
doSaveBelongDept
(
project
,
CommonConstants
.
ONE_STRING
);
}
// 更新或新增薪资人员
// 2024-11-6 16:56:46 新逻辑:在项人员,要更新薪资人员,及时卡号为空也要更新
if
(
Common
.
isNotNull
(
tPreEmployeeInfo
.
getBankNo
())
||
isMustUpdateSalary
)
{
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryAccountExportVo.java
View file @
8929255f
...
...
@@ -134,4 +134,10 @@ public class SalaryAccountExportVo{
*/
@ExcelProperty
(
"结算月"
)
private
String
settlementMonth
;
/**
* 个税金额(个人承担)
*/
@ExcelProperty
(
"个税金额"
)
private
BigDecimal
salaryTax
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
8929255f
...
...
@@ -234,7 +234,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setHeader
(
CommonConstants
.
CONTENT_DISPOSITION
,
CommonConstants
.
ATTACHMENT_FILENAME
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
//非管理员导出 大于100W 提示“导出量过大,请选择更多查询条件!如果确定要导出这些数据请联系系统管理员操作”
if
(
count
>
6
00000
)
{
if
(
count
>
10
00000
)
{
out
.
write
(
CommonConstants
.
SOCIAL_EXPORT_LIMIT
.
getBytes
(
"GBK"
));
out
.
close
();
return
;
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
8929255f
...
...
@@ -1584,7 +1584,7 @@
case a.FORM_TYPE when '0' then '薪资' when '1' then '绩效' when '3' then '劳务费' when '4' then '稿酬' else '其他' end as FORM_TYPE,
a.SALARY_MONTH,
if(a.RELAY_SALARY_UNIT is not null and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,ifnull(a.RELAY_SALARY,0)) RELAY_SALARY,
a.ACTUAL_SALARY
a.ACTUAL_SALARY
,a.SALARY_TAX
FROM
<if
test=
"searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'"
>
t_salary_account a
...
...
@@ -1652,7 +1652,7 @@
case a.FORM_TYPE when '0' then '薪资' when '1' then '绩效' when '3' then '劳务费' when '4' then '稿酬' else '其他' end as FORM_TYPE,
a.SALARY_MONTH,
if(a.RELAY_SALARY_UNIT is not null and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,ifnull(a.RELAY_SALARY,0)) RELAY_SALARY,
a.ACTUAL_SALARY
a.ACTUAL_SALARY
,a.SALARY_TAX
FROM
<if
test=
"searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'"
>
t_salary_account a
...
...
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