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
8414666c
Commit
8414666c
authored
May 26, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.11' into MVP1.7.11
parents
7393025a
c7e0a529
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
43 additions
and
21 deletions
+43
-21
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+7
-8
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+7
-8
IcbcTransactionFlowIssueController.java
...v1/ekp/controller/IcbcTransactionFlowIssueController.java
+1
-1
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+1
-0
InsuranceSearchVo.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceSearchVo.java
+7
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+11
-2
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+7
-0
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+1
-1
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
8414666c
...
@@ -488,16 +488,15 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -488,16 +488,15 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
}
}
// 创建更新条件构造器
LambdaUpdateWrapper
<
TAttaInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
// 设置更新条件和新值
updateWrapper
.
eq
(
TAttaInfo:
:
getDomainId
,
employeeRegistrationPre
.
getId
())
.
set
(
TAttaInfo:
:
getDomainId
,
CommonConstants
.
EMPTY_STRING
);
// 执行更新操作,清空附件的域名ID
attaInfoService
.
update
(
updateWrapper
);
// 检查附件ID列表是否不为空、更新附件
// 检查附件ID列表是否不为空、更新附件
if
(
Common
.
isNotNull
(
employeeRegistrationPre
.
getAttaIdList
()))
{
if
(
Common
.
isNotNull
(
employeeRegistrationPre
.
getAttaIdList
()))
{
// 创建更新条件构造器
LambdaUpdateWrapper
<
TAttaInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
// 设置更新条件和新值
updateWrapper
.
eq
(
TAttaInfo:
:
getDomainId
,
employeeRegistrationPre
.
getId
())
.
set
(
TAttaInfo:
:
getDomainId
,
CommonConstants
.
EMPTY_STRING
);
// 执行更新操作,清空附件的域名ID
attaInfoService
.
update
(
updateWrapper
);
// 遍历员工注册记录中的附件ID列表
// 遍历员工注册记录中的附件ID列表
TAttaInfo
atta
;
TAttaInfo
atta
;
for
(
String
attaId
:
employeeRegistrationPre
.
getAttaIdList
())
{
for
(
String
attaId
:
employeeRegistrationPre
.
getAttaIdList
())
{
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
8414666c
...
@@ -1458,16 +1458,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1458,16 +1458,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
* @param registration 员工注册对象,包含附件ID列表
* @param registration 员工注册对象,包含附件ID列表
*/
*/
private
void
updateFileId
(
EmployeeRegistration
registration
)
{
private
void
updateFileId
(
EmployeeRegistration
registration
)
{
// 创建更新条件构造器
LambdaUpdateWrapper
<
TCspAttaInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
// 设置更新条件和新值
updateWrapper
.
eq
(
TCspAttaInfo:
:
getDomainId
,
registration
.
getId
())
.
set
(
TCspAttaInfo:
:
getDomainId
,
CommonConstants
.
EMPTY_STRING
);
// 执行更新操作,清空附件的域名ID
tAttaInfoService
.
update
(
updateWrapper
);
// 检查附件ID列表是否不为空
// 检查附件ID列表是否不为空
if
(
Common
.
isNotNull
(
registration
.
getAttaIdList
())
&&
!
registration
.
getAttaIdList
().
isEmpty
())
{
if
(
Common
.
isNotNull
(
registration
.
getAttaIdList
())
&&
!
registration
.
getAttaIdList
().
isEmpty
())
{
// 创建更新条件构造器
LambdaUpdateWrapper
<
TCspAttaInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
// 设置更新条件和新值
updateWrapper
.
eq
(
TCspAttaInfo:
:
getDomainId
,
registration
.
getId
())
.
set
(
TCspAttaInfo:
:
getDomainId
,
CommonConstants
.
EMPTY_STRING
);
// 执行更新操作,清空附件的域名ID
tAttaInfoService
.
update
(
updateWrapper
);
// 遍历员工注册记录中的附件ID列表
// 遍历员工注册记录中的附件ID列表
TCspAttaInfo
atta
;
TCspAttaInfo
atta
;
for
(
String
id
:
registration
.
getAttaIdList
())
{
for
(
String
id
:
registration
.
getAttaIdList
())
{
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowIssueController.java
View file @
8414666c
...
@@ -144,7 +144,7 @@ public class IcbcTransactionFlowIssueController {
...
@@ -144,7 +144,7 @@ public class IcbcTransactionFlowIssueController {
}
}
@Operation
(
summary
=
"定时任务获取回单文件"
,
description
=
"定时任务获取回单文件"
)
@Operation
(
summary
=
"定时任务获取回单文件"
,
description
=
"定时任务获取回单文件"
)
@PostMapping
(
"/getPdfFile"
)
@PostMapping
(
"/get
Test
PdfFile"
)
public
R
getPdfFileTest
()
{
public
R
getPdfFileTest
()
{
return
icbcTransactionFlowIssueService
.
getPdfFile
();
return
icbcTransactionFlowIssueService
.
getPdfFile
();
}
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
8414666c
...
@@ -1060,6 +1060,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -1060,6 +1060,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
//String privateKeyPath = "D:/icbcFile/icbc"; // 替换为你的私钥路径
//String privateKeyPath = "D:/icbcFile/icbc"; // 替换为你的私钥路径
//E:\IdeaProjects\yifu_mvp\yifu-ekp\yifu-ekp-biz\src\main\resources\icbc\icbc
//E:\IdeaProjects\yifu_mvp\yifu-ekp\yifu-ekp-biz\src\main\resources\icbc\icbc
String
privateKeyPath
=
System
.
getProperty
(
"user.dir"
)
+
"/yifu-ekp/yifu-ekp-biz/src/main/resources/icbc/icbc"
;
// 远程目录路径
String
privateKeyPath
=
System
.
getProperty
(
"user.dir"
)
+
"/yifu-ekp/yifu-ekp-biz/src/main/resources/icbc/icbc"
;
// 远程目录路径
log
.
info
(
"秘钥文件目录: "
+
privateKeyPath
);
// 远程目录路径
// 远程目录路径
String
remoteDir
=
"/JFTStatementDownload/download"
;
String
remoteDir
=
"/JFTStatementDownload/download"
;
Session
session
=
null
;
Session
session
=
null
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceSearchVo.java
View file @
8414666c
...
@@ -54,4 +54,11 @@ public class InsuranceSearchVo extends TBusinessInsuranceVo{
...
@@ -54,4 +54,11 @@ public class InsuranceSearchVo extends TBusinessInsuranceVo{
*/
*/
@Schema
(
description
=
"消息提醒人ID"
)
@Schema
(
description
=
"消息提醒人ID"
)
private
String
alertId
;
private
String
alertId
;
/**
* 项目权限NO
*/
@Schema
(
description
=
"项目权限ID"
)
private
List
<
String
>
settleDomainIds
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
8414666c
...
@@ -7948,13 +7948,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -7948,13 +7948,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
InsuranceSearchVo
condition
)
{
public
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
InsuranceSearchVo
condition
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
long
roleId
=
1851541100126863362L
;
long
roleId
=
1851541100126863362L
;
long
roleId2
=
202505261018111L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
boolean
isProjectManager
=
this
.
haveRole
(
user
,
roleId2
);
if
(
isSsc
)
{
if
(
isSsc
)
{
condition
.
setAlertId
(
null
);
condition
.
setAlertId
(
null
);
}
else
{
}
else
if
(
isProjectManager
){
condition
.
setAlertId
(
null
);
}
else
{
condition
.
setAlertId
(
user
.
getId
());
condition
.
setAlertId
(
user
.
getId
());
}
}
// R<TSettleDomainListVo> sdRes = archivesDaprUtil.getPermissionByUserId(user.getId());
if
(
isProjectManager
){
R
<
TSettleDomainListVo
>
sdRes
=
archivesDaprUtil
.
getSettleDomainIdsByUserId
(
user
.
getId
());
if
(
Common
.
isNotNull
(
sdRes
)){
condition
.
setSettleDomainIds
(
sdRes
.
getData
().
getDeptNos
());
}
}
// List<TInsuranceAreaRes> areaRes = insuranceAreaResMapper.selectList(Wrappers.<TInsuranceAreaRes>query().lambda()
// List<TInsuranceAreaRes> areaRes = insuranceAreaResMapper.selectList(Wrappers.<TInsuranceAreaRes>query().lambda()
// .eq(TInsuranceAreaRes::getUserId, user.getId()).eq(TInsuranceAreaRes::getStatus, CommonConstants.ZERO_STRING));
// .eq(TInsuranceAreaRes::getUserId, user.getId()).eq(TInsuranceAreaRes::getStatus, CommonConstants.ZERO_STRING));
// if (Common.isNotNull(areaRes)) {
// if (Common.isNotNull(areaRes)) {
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
8414666c
...
@@ -1867,6 +1867,13 @@
...
@@ -1867,6 +1867,13 @@
#{param}
#{param}
</foreach>
</foreach>
</if>
</if>
<if
test=
"param.settleDomainIds != null and param.settleDomainIds.size() > 0"
>
and a.DEPT_NO in
<foreach
collection=
"param.settleDomainIds"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
</if>
</if>
</if>
</where>
</where>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
8414666c
...
@@ -305,7 +305,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
...
@@ -305,7 +305,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
// 分批查询和写入
// 分批查询和写入
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
int
batchSize
=
CommonConstants
.
EXCEL_EXPORT_LIMIT_1
;
int
batchSize
=
100000
;
int
totalPages
=
(
int
)
Math
.
ceil
((
double
)
count
/
batchSize
);
int
totalPages
=
(
int
)
Math
.
ceil
((
double
)
count
/
batchSize
);
List
<
SalaryAccountExportVo
>
batchList
;
List
<
SalaryAccountExportVo
>
batchList
;
for
(
int
page
=
1
;
page
<=
totalPages
;
page
++)
{
for
(
int
page
=
1
;
page
<=
totalPages
;
page
++)
{
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
8414666c
...
@@ -1790,7 +1790,7 @@
...
@@ -1790,7 +1790,7 @@
a.BANK_SUB_NAME,
a.BANK_SUB_NAME,
case a.FORM_TYPE when '0' then '薪资' when '1' then '绩效' when '3' then '劳务费' when '4' then '稿酬' else '其他' end as FORM_TYPE,
case a.FORM_TYPE when '0' then '薪资' when '1' then '绩效' when '3' then '劳务费' when '4' then '稿酬' else '其他' end as FORM_TYPE,
a.SALARY_MONTH,
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,
if(
ifnull(a.RELAY_SALARY_UNIT,-1) != -1
and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,ifnull(a.RELAY_SALARY,0)) RELAY_SALARY,
a.ACTUAL_SALARY,a.SALARY_TAX
a.ACTUAL_SALARY,a.SALARY_TAX
FROM
FROM
<if
test=
"searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'"
>
<if
test=
"searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'"
>
...
...
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