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
cad93bb2
Commit
cad93bb2
authored
Dec 15, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商险id类型修改
parent
c3b6aad3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
848 additions
and
951 deletions
+848
-951
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+0
-52
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+0
-8
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+0
-43
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+14
-364
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+4
-380
DoJointSocialTask.java
...ifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
+830
-104
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
cad93bb2
...
...
@@ -341,58 +341,6 @@ public class TEmployeeProjectController {
return
tEmployeeProjectService
.
updateEmployeeSalaryStatus
(
vo
);
}
/**
* 查询项目档案在档人数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation
(
summary
=
"查询项目档案在档人数"
,
description
=
"查询项目档案在档人数"
)
@PostMapping
(
"/selectInUseEmployeeProjectCount"
)
public
R
selectInUseEmployeeProjectCount
(
@RequestBody
String
deptNo
)
{
return
tEmployeeProjectService
.
selectInUseEmployeeProjectCount
(
deptNo
);
}
/**
* 查询项目员工合同在用数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation
(
summary
=
"查询项目员工合同在用数"
,
description
=
"查询项目员工合同在用数"
)
@PostMapping
(
"/selectInUseEmployeeContractCount"
)
public
R
selectInUseEmployeeContractCount
(
@RequestBody
String
deptNo
)
{
return
tEmployeeProjectService
.
selectInUseEmployeeContractCount
(
deptNo
);
}
/**
* 查询社保在保人数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation
(
summary
=
"查询社保在保人数"
,
description
=
"查询社保在保人数"
)
@PostMapping
(
"/selectInUseSocialCount"
)
public
R
selectInUseSocialCount
(
@RequestBody
String
deptNo
)
{
return
tEmployeeProjectService
.
selectInUseSocialCount
(
deptNo
);
}
/**
* 查询公积金在保人数
* @author hyc
* @param deptNo
* @date 2022-12-12 17:45
* @return R
*/
@Operation
(
summary
=
"查询公积金在保人数"
,
description
=
"查询公积金在保人数"
)
@PostMapping
(
"/selectInUseFundCount"
)
public
R
selectInUseFundCount
(
@RequestBody
String
deptNo
)
{
return
tEmployeeProjectService
.
selectInUseFundCount
(
deptNo
);
}
/**
* 查询项目对应的数据
* @author hyc
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
cad93bb2
...
...
@@ -226,14 +226,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
**/
void
everyDayUpdateEmployeContractStatus
();
R
selectInUseEmployeeProjectCount
(
String
deptNo
);
R
selectInUseEmployeeContractCount
(
String
deptNo
);
R
selectInUseSocialCount
(
String
deptNo
);
R
selectInUseFundCount
(
String
deptNo
);
R
<
List
<
TSettleDomainDataVo
>>
selectSettleMentData
(
List
<
String
>
deptNoList
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
cad93bb2
...
...
@@ -1416,49 +1416,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
baseMapper
.
everyDayUpdateEmployeContractStatus
();
}
@Override
public
R
selectInUseEmployeeProjectCount
(
String
deptNo
)
{
//查询项目档案在档人数
return
R
.
ok
(
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
deptNo
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)));
}
@Override
public
R
selectInUseEmployeeContractCount
(
String
deptNo
)
{
//项目员工合同在用数
return
R
.
ok
(
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
deptNo
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeProject:
:
getContractStatus
,
CommonConstants
.
ONE_INT
)));
}
@Override
public
R
selectInUseSocialCount
(
String
deptNo
)
{
//查询社保在保人数
return
R
.
ok
(
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
deptNo
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
and
(
obj
->
obj
.
eq
(
TEmployeeProject:
:
getSocialStatus
,
CommonConstants
.
ONE_INT
)
.
or
().
eq
(
TEmployeeProject:
:
getSocialStatus
,
CommonConstants
.
TWO_INT
)
.
or
().
eq
(
TEmployeeProject:
:
getSocialStatus
,
CommonConstants
.
THREE_INT
))));
}
@Override
public
R
selectInUseFundCount
(
String
deptNo
)
{
//查询公积金在保人数
return
R
.
ok
(
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
deptNo
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
and
(
obj
->
obj
.
eq
(
TEmployeeProject:
:
getFundStatus
,
CommonConstants
.
ONE_INT
)
.
or
().
eq
(
TEmployeeProject:
:
getFundStatus
,
CommonConstants
.
TWO_INT
)
.
or
().
eq
(
TEmployeeProject:
:
getFundStatus
,
CommonConstants
.
THREE_INT
))));
}
@Override
public
R
<
List
<
TSettleDomainDataVo
>>
selectSettleMentData
(
List
<
String
>
deptNoList
)
{
List
<
TSettleDomainDataVo
>
list
=
new
ArrayList
<>();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
cad93bb2
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
cad93bb2
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
View file @
cad93bb2
This diff is collapsed.
Click to expand it.
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