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
c7b11685
Commit
c7b11685
authored
Jul 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-薪资导入相关
parent
1d06b323
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
190 additions
and
74 deletions
+190
-74
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+36
-0
TSalaryStandard.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
+8
-0
SalaryUploadParamVo.java
...ifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadParamVo.java
+3
-0
TSalaryEmployeeController.java
.../v1/yifu/salary/controller/TSalaryEmployeeController.java
+2
-2
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+14
-5
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+110
-54
application.yml
...salary/yifu-salary-biz/src/main/resources/application.yml
+2
-0
TBankSetMapper.xml
...u-salary-biz/src/main/resources/mapper/TBankSetMapper.xml
+12
-12
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
c7b11685
...
...
@@ -794,6 +794,26 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
vo
.
setTpreEmpProfessionalQualificationList
(
tPreEmpProfessionalQualificationList
);
// 预入职-其他附件
List
<
TPreEmpOtherFile
>
tPreEmpOtherFileList
=
tPreEmpOtherFileService
.
getTPreEmpOtherFileList
(
id
);
if
(
tPreEmpOtherFileList
!=
null
&&
!
tPreEmpOtherFileList
.
isEmpty
())
{
List
<
TAttaInfo
>
attaInfoList
;
URL
url
;
for
(
TPreEmpOtherFile
info
:
tPreEmpOtherFileList
)
{
// 附件
attaInfoList
=
tAttaInfoService
.
getTAttaInfoListByDoMainId
(
info
.
getId
());
if
(
attaInfoList
!=
null
)
{
for
(
TAttaInfo
atta
:
attaInfoList
)
{
url
=
ossUtil
.
getObjectUrl
(
null
,
atta
.
getAttaSrc
());
atta
.
setAttaUrl
(
String
.
valueOf
(
url
));
}
}
info
.
setAttaList
(
attaInfoList
);
}
}
vo
.
setTpreEmpOtherFileList
(
tPreEmpOtherFileList
);
// 预入职-员工工作履历信息表
List
<
TPreEmpWorkRecording
>
tPreEmpWorkRecording
=
tPreEmpWorkRecordingService
.
getTPreEmpWorkRecordingList
(
id
);
vo
.
setTpreEmpWorkRecordingList
(
tPreEmpWorkRecording
);
...
...
@@ -824,6 +844,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
public
R
<
String
>
doImproveInformation
(
PreEmpMainDetailVo
vo
)
{
TPreEmpMain
preMain
=
vo
.
getMain
();
TPreEmployeeInfo
tPreEmployee
=
vo
.
getTpreEmployeeInfo
();
TPreEmployeeInfo
oldPreEmployee
=
tPreEmployeeInfoService
.
getTPreEmployeeInfoList
(
preMain
.
getId
());
TPreEmployeeProject
project
=
vo
.
getTpreEmployeeProject
();
if
(
preMain
==
null
||
tPreEmployee
==
null
||
project
==
null
||
Common
.
isEmpty
(
preMain
.
getId
())
||
Common
.
isEmpty
(
tPreEmployee
.
getId
())
||
Common
.
isEmpty
(
project
.
getId
()))
{
...
...
@@ -843,6 +864,21 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
errorInfo
))
{
return
R
.
failed
(
errorInfo
+
"不可为空!"
);
}
// 计税月份
if
(
Common
.
isNotNull
(
tPreEmployee
.
getBankNo
())
&&
Common
.
isEmpty
(
tPreEmployee
.
getTaxMonth
()))
{
return
R
.
failed
(
"有银行卡号,计税月份必填!"
);
}
if
(
Common
.
isNotNull
(
tPreEmployee
.
getTaxMonth
()))
{
String
taxMonth
=
tPreEmployee
.
getTaxMonth
().
trim
();
if
(!
taxMonth
.
matches
(
taxMonthRegex
))
{
return
R
.
failed
(
"计税月份为6位年月,例如:202407!"
);
}
if
(
Common
.
isNotNull
(
tPreEmployee
.
getTaxMonthFlag
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
tPreEmployee
.
getTaxMonthFlag
())
&&
oldPreEmployee
!=
null
&&
!
oldPreEmployee
.
getTaxMonth
().
equals
(
tPreEmployee
.
getTaxMonth
())
)
{
return
R
.
failed
(
"本年度有发薪纪录,计税月份不可编辑!"
);
}
}
tPreEmployeeInfoService
.
updateById
(
tPreEmployee
);
project
.
setEmpNatrue
(
tPreEmployee
.
getEmpNatrue
());
tPreEmployeeProjectService
.
updateById
(
project
);
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
View file @
c7b11685
...
...
@@ -482,6 +482,14 @@ public class TSalaryStandard extends BaseEntity {
@ExcelProperty
(
"表格类型 0 薪资原表 1 系统模板"
)
private
String
excelType
;
/**
* 新员工是否更新
*/
@ExcelAttribute
(
name
=
"新员工是否更新"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"新员工是否更新:0否;1是"
)
private
String
newEmpUpdateFlag
;
/**
* 工资月份-起
*/
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadParamVo.java
View file @
c7b11685
...
...
@@ -50,4 +50,7 @@ public class SalaryUploadParamVo {
// 原表类型
String
originalSetName
;
// 新员工是否更新:0否;1是
String
newEmpUpdateFlag
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryEmployeeController.java
View file @
c7b11685
...
...
@@ -229,7 +229,7 @@ public class TSalaryEmployeeController {
* @param empIdCard 身份证
* @Description: 根据身份证获取计税月份
* @Author: hgw
* @Date: 202
2/8/10 17:01
* @Date: 202
4-7-18 10:48:15
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo>
**/
@Inner
...
...
@@ -241,7 +241,7 @@ public class TSalaryEmployeeController {
/**
* @Description: 预入职保存薪资人员
* @Author: hgw
* @Date: 202
2/8/10 17:01
* @Date: 202
4-7-18 10:48:12
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo>
**/
@Inner
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
c7b11685
...
...
@@ -229,7 +229,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
}
//劳务费和稿酬导入
if
(
CommonConstants
.
THREE_STRING
.
equals
(
salaryType
)
||
CommonConstants
.
FOUR_STRING
.
equals
(
salaryType
))
{
return
this
.
saveLaborSubmit
(
configSalary
,
saList
,
dept
,
salaryType
,
orderId
);
return
this
.
saveLaborSubmit
(
configSalary
,
saList
,
vo
,
dept
);
}
}
else
{
return
R
.
failed
(
"导入数据不可为空"
);
...
...
@@ -254,13 +254,16 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
* @return: com.yifu.cloud.v1.hrms.api.entity.TSalaryStandard
**/
public
R
<
TSalaryStandard
>
saveNewTSalary
(
TConfigSalary
configSalary
,
TSalaryAccountVo
sav
,
TSettleDomainSelectVo
dept
,
YifuUser
user
,
LocalDateTime
nowTime
,
String
invoiceTitle
)
{
,
YifuUser
user
,
LocalDateTime
nowTime
,
String
invoiceTitle
,
String
newEmpUpdateFlag
)
{
TSalaryStandard
s
=
null
;
if
(
sav
!=
null
)
{
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
null
;
}
s
=
new
TSalaryStandard
();
if
(
Common
.
isNotNull
(
newEmpUpdateFlag
))
{
s
.
setNewEmpUpdateFlag
(
newEmpUpdateFlag
);
}
s
.
setInvoiceTitle
(
invoiceTitle
);
s
.
setType
(
CommonConstants
.
ZERO_INT
);
s
.
setBelongDeptId
(
String
.
valueOf
(
user
.
getDeptId
()));
...
...
@@ -335,7 +338,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
LocalDateTime
nowTime
=
LocalDateTime
.
now
();
TSalaryStandard
salary
;
//工资主表
R
<
TSalaryStandard
>
sr
=
this
.
saveNewTSalary
(
configSalary
,
salaryAccountVo
,
dept
,
user
,
nowTime
,
invoiceTitle
);
//工资主表
R
<
TSalaryStandard
>
sr
=
this
.
saveNewTSalary
(
configSalary
,
salaryAccountVo
,
dept
,
user
,
nowTime
,
invoiceTitle
,
vo
.
getNewEmpUpdateFlag
());
//工资主表
if
(
sr
==
null
||
sr
.
getCode
()
==
CommonConstants
.
FAIL
)
{
return
sr
;
}
else
{
...
...
@@ -1524,7 +1528,11 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
* @Date: 2022/8/16
* @return: com.yifu.cloud.v1.common.core.util.R
**/
public
R
saveLaborSubmit
(
TConfigSalary
configSalary
,
List
<
TSalaryAccountVo
>
savList
,
TSettleDomainSelectVo
dept
,
String
salaryType
,
String
orderId
)
{
public
R
saveLaborSubmit
(
TConfigSalary
configSalary
,
List
<
TSalaryAccountVo
>
savList
,
SalaryUploadParamVo
vo
,
TSettleDomainSelectVo
dept
)
{
String
orderId
=
vo
.
getOrderId
();
String
salaryType
=
vo
.
getSalaryType
();
String
newEmpUpdateFlag
=
vo
.
getNewEmpUpdateFlag
();
if
(
Common
.
isNotNull
(
savList
)
&&
!
savList
.
isEmpty
())
{
TSalaryAccountVo
salaryAccountVo
=
savList
.
get
(
0
);
List
<
TSalaryAccountItem
>
saiList
=
null
;
//报账明细List
...
...
@@ -1533,7 +1541,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
LocalDateTime
nowTime
=
LocalDateTime
.
now
();
//工资主表
String
invoiceTitle
=
dept
.
getBusinessSubjectName
();
R
<
TSalaryStandard
>
sr
=
this
.
saveNewTSalary
(
configSalary
,
salaryAccountVo
,
dept
,
user
,
nowTime
,
invoiceTitle
);
R
<
TSalaryStandard
>
sr
=
this
.
saveNewTSalary
(
configSalary
,
salaryAccountVo
,
dept
,
user
,
nowTime
,
invoiceTitle
,
newEmpUpdateFlag
);
if
(
sr
==
null
||
sr
.
getCode
()
==
CommonConstants
.
FAIL
)
{
return
sr
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
c7b11685
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/resources/application.yml
View file @
c7b11685
...
...
@@ -41,6 +41,8 @@ security:
-
/swagger-ui/**
-
/taveragesalary/getAverageSalary
-
/tbankset/getWebcBankSetIdNameList
-
/tsalaryemployee/inner/getEmpTaxMonth
-
/tsalaryemployee/inner/savePreNewEmpInfo
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TBankSetMapper.xml
View file @
c7b11685
...
...
@@ -69,6 +69,18 @@
</if>
</sql>
<!--tBankSet简单分页查询-->
<select
id=
"getTBankSetPage"
resultMap=
"tBankSetMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_bank_set a
<where>
a.DELETE_FLAG = '0'
<include
refid=
"tBankSet_where"
/>
</where>
order by a.CREATE_TIME desc
</select>
<!--获取IdName-->
<select
id=
"getTBankSetIdNameList"
resultMap=
"tBankSetMap"
>
SELECT
...
...
@@ -93,16 +105,4 @@
</if>
order by a.CREATE_TIME desc
</select>
<!--list-->
<select
id=
"getTBankSetList"
resultType=
"java.lang.String"
>
SELECT
a.BANK_NAME
FROM t_bank_set a
where a.DELETE_FLAG = '0'
<if
test=
"bankName != null and bankName.trim() != ''"
>
and a.BANK_NAME = #{bankName}
</if>
order by a.CREATE_TIME desc
</select>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
c7b11685
...
...
@@ -87,6 +87,7 @@
<result
property=
"excelType"
column=
"EXCEL_TYPE"
/>
<result
property=
"setName"
column=
"SET_NAME"
/>
<result
property=
"originalSetName"
column=
"ORIGINAL_SET_NAME"
/>
<result
property=
"newEmpUpdateFlag"
column=
"NEW_EMP_UPDATE_FLAG"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -151,7 +152,8 @@
a.DELETE_DATE,
a.EXCEL_TYPE,
a.SET_NAME,
a.ORIGINAL_SET_NAME
a.ORIGINAL_SET_NAME,
a.NEW_EMP_UPDATE_FLAG
</sql>
<sql
id=
"tSalaryStandard_where"
>
<if
test=
"tSalaryStandard != null"
>
...
...
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