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
88d75ebc
Commit
88d75ebc
authored
Dec 01, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单大病&项目查询导出
parent
cef21fd8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
1 deletion
+25
-1
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+13
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+12
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
88d75ebc
...
...
@@ -75,6 +75,18 @@ public class TSettleDomainController {
return
R
.
ok
(
tSettleDomainService
.
page
(
page
,
Wrappers
.
query
(
tSettleDomain
)));
}
/**
* 不分页查询
*
* @param tSettleDomain 项目表
* @return
*/
@Operation
(
summary
=
"不分页查询"
,
description
=
"不分页查询"
)
@GetMapping
(
"/noPage"
)
public
R
<
List
<
TSettleDomain
>>
getTSettleDomainNoPage
(
TSettleDomain
tSettleDomain
)
{
return
R
.
ok
(
tSettleDomainService
.
list
(
Wrappers
.
query
(
tSettleDomain
)));
}
/**
* 通过id查询项目表
...
...
@@ -267,7 +279,7 @@ public class TSettleDomainController {
/**
* 修改项目表--EKP调用接口
* @author hyc
* @param
list
项目表
* @param
jsonStr
项目表
* @return R
*/
@Operation
(
summary
=
"修改项目表--EKP调用接口"
,
description
=
"修改项目表--EKP调用接口"
)
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
88d75ebc
...
...
@@ -1047,6 +1047,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund
.
setUpperLimit
(
socialSet
.
getUpperLimit
());
socialFund
.
setPayPolicy
(
socialSet
.
getPayPolicy
());
socialFund
.
setLatestCardinality
(
socialSet
.
getInsuranceIsLatestCardinality
());
//配置没有大病清理社保公积金查询里面残留的历史大病信息
if
(
CommonConstants
.
ONE_STRING
.
equals
(
socialSet
.
getIsIllness
())
&&
Common
.
isNotNull
(
socialFund
.
getBigailmentHandle
())){
socialFund
.
setBigailmentHandle
(
null
);
socialFund
.
setBigailmentStart
(
null
);
socialFund
.
setUnitBigailmentCardinal
(
null
);
socialFund
.
setUnitBigailmentPer
(
null
);
socialFund
.
setPersonalBigailmentCardinal
(
null
);
socialFund
.
setPersonalBigailmentPer
(
null
);
socialFund
.
setPersonalBigailmentMoney
(
null
);
socialFund
.
setUnitBigailmentMoney
(
null
);
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
...
...
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