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
81e21237
Commit
81e21237
authored
Dec 30, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-电子档案批量导入第三次提交
parent
071845e2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+1
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+1
-1
TElectronicArchiveDetailMapper.xml
.../main/resources/mapper/TElectronicArchiveDetailMapper.xml
+4
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
81e21237
...
@@ -291,6 +291,7 @@ public class TSettleDomainController {
...
@@ -291,6 +291,7 @@ public class TSettleDomainController {
List
<
TSettleDomainSelectVo
>
list
=
new
ArrayList
<>();
List
<
TSettleDomainSelectVo
>
list
=
new
ArrayList
<>();
TSettleDomain
tSettleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
TSettleDomain
tSettleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
tSettleDomainSelectVo
.
getDepartNo
())
.
eq
(
TSettleDomain:
:
getDepartNo
,
tSettleDomainSelectVo
.
getDepartNo
())
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
BeanUtils
.
copyProperties
(
tSettleDomain
,
tSettleDomainSelectVo
);
BeanUtils
.
copyProperties
(
tSettleDomain
,
tSettleDomainSelectVo
);
tSettleDomainSelectVo
.
setCustomerCode
(
tSettleDomain
.
getCustomerNo
());
tSettleDomainSelectVo
.
setCustomerCode
(
tSettleDomain
.
getCustomerNo
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
81e21237
...
@@ -2833,6 +2833,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2833,6 +2833,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
vo
.
getNo
())
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
vo
.
getNo
())
.
eq
(
TEmployeeInfo:
:
getEmpName
,
vo
.
getName
())
.
eq
(
TEmployeeInfo:
:
getEmpName
,
vo
.
getName
())
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
81e21237
...
@@ -573,7 +573,7 @@
...
@@ -573,7 +573,7 @@
a.EMP_NAME,
a.EMP_NAME,
a.EMP_IDCARD
a.EMP_IDCARD
from t_employee_info a
from t_employee_info a
where 1=1
where 1=1
and a.delete_flag = '0'
<if
test=
"tEmployeeInfo != null"
>
<if
test=
"tEmployeeInfo != null"
>
<if
test=
"tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''"
>
<if
test=
"tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''"
>
AND a.EMP_NAME like concat('%',#{tEmployeeInfo.empName},'%')
AND a.EMP_NAME like concat('%',#{tEmployeeInfo.empName},'%')
...
...
yifu-batch/yifu-batch-biz/src/main/resources/mapper/TElectronicArchiveDetailMapper.xml
View file @
81e21237
...
@@ -68,10 +68,11 @@
...
@@ -68,10 +68,11 @@
AND a.CUSTOMER_CODE = #{tElectronicArchiveDetail.customerCode}
AND a.CUSTOMER_CODE = #{tElectronicArchiveDetail.customerCode}
</if>
</if>
<if
test=
"tElectronicArchiveDetail.typeList != null and tElectronicArchiveDetail.typeList.size() > 0"
>
<if
test=
"tElectronicArchiveDetail.typeList != null and tElectronicArchiveDetail.typeList.size() > 0"
>
AND
a.MATERIAL_TYPE in
AND
(
<foreach
item=
"item"
index=
"index"
collection=
"tElectronicArchiveDetail.typeList"
open=
"("
separator=
","
close=
")
"
>
<foreach
item=
"item"
index=
"index"
collection=
"tElectronicArchiveDetail.typeList"
separator=
" OR
"
>
'${item}'
FIND_IN_SET(#{item}, a.MATERIAL_TYPE) > 0
</foreach>
</foreach>
)
</if>
</if>
<if
test=
"tElectronicArchiveDetail.fileProvince != null"
>
<if
test=
"tElectronicArchiveDetail.fileProvince != null"
>
AND a.FILE_PROVINCE = #{tElectronicArchiveDetail.fileProvince}
AND a.FILE_PROVINCE = #{tElectronicArchiveDetail.fileProvince}
...
...
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