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
f39c5ec6
Commit
f39c5ec6
authored
Feb 27, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-商险接口推送优化
parent
f24a431c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
9 deletions
+39
-9
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+3
-2
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+3
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+5
-2
TSalaryStandardSelectViewVo.java
...d/plus/v1/yifu/salary/vo/TSalaryStandardSelectViewVo.java
+21
-0
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+7
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
f39c5ec6
...
...
@@ -36,6 +36,7 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSelectViewVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardUnprojectVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
...
@@ -370,7 +371,7 @@ public class TEmployeeProjectController {
}
/**
* @param
id
项目主键
* @param
voList
项目主键
* @Description: 通过id获取结算主体及单位部分信息
* @Author: huyc
* @Date: 2025/2/25 17:01
...
...
@@ -378,7 +379,7 @@ public class TEmployeeProjectController {
**/
@Inner
@PostMapping
(
"/inner/getUnProjectEmpList"
)
public
List
<
TSalaryStandardUnprojectVo
>
getUnProjectEmpList
(
@RequestBody
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
public
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
@RequestBody
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
return
tEmployeeProjectService
.
getUnProjectEmpList
(
voList
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
f39c5ec6
...
...
@@ -27,6 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSelectViewVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardUnprojectVo
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -41,7 +42,8 @@ import java.util.Map;
* @date 2022-06-20 09:19:40
*/
public
interface
TEmployeeProjectService
extends
IService
<
TEmployeeProject
>
{
List
<
TSalaryStandardUnprojectVo
>
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
);
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
);
/**
* @param tEmployeeProject
* @Description: 新增项目档案校验
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
f39c5ec6
...
...
@@ -53,6 +53,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSelectViewVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardUnprojectVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
...
...
@@ -114,8 +115,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
private
TEmployeeContractAuditService
tEmployeeContractAuditService
;
@Override
public
List
<
TSalaryStandardUnprojectVo
>
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
public
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
List
<
TSalaryStandardUnprojectVo
>
unProjectList
=
new
ArrayList
<>();
TSalaryStandardSelectViewVo
viewVo
=
new
TSalaryStandardSelectViewVo
();
if
(!
voList
.
isEmpty
())
{
TEmployeeProject
employeeProject
;
for
(
TSalaryStandardUnprojectVo
vo
:
voList
)
{
...
...
@@ -129,7 +131,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
unProjectList
.
add
(
vo
);
}
}
return
unProjectList
;
viewVo
.
setSalaryList
(
unProjectList
);
return
viewVo
;
}
else
{
return
null
;
}
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryStandardSelectViewVo.java
0 → 100644
View file @
f39c5ec6
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* @Author fxj
* @Date 2022/8/8
* @Description
* @Version 1.0
*/
@Data
public
class
TSalaryStandardSelectViewVo
implements
Serializable
{
/**
* 薪资list
*/
private
List
<
TSalaryStandardUnprojectVo
>
salaryList
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
f39c5ec6
...
...
@@ -135,13 +135,16 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
return
null
;
}
//找到不在项人员的身份证信息
R
<
List
<
TSalaryStandardUnprojectVo
>
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/temployeeproject/inner/getUnProjectEmpList"
,
voList
,
TSalaryStandard
Unproject
Vo
.
class
,
SecurityConstants
.
FROM_IN
);
R
<
TSalaryStandardSelectViewVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/temployeeproject/inner/getUnProjectEmpList"
,
voList
,
TSalaryStandard
SelectView
Vo
.
class
,
SecurityConstants
.
FROM_IN
);
// 结算主体
List
<
TSalaryStandardUnprojectVo
>
unEmpList
=
new
ArrayList
<>
();
TSalaryStandardSelectViewVo
viewVo
=
new
TSalaryStandardSelectViewVo
();
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
unEmpList
=
sdr
.
getData
();
viewVo
=
sdr
.
getData
();
}
else
{
return
null
;
}
List
<
TSalaryStandardUnprojectVo
>
unEmpList
=
viewVo
.
getSalaryList
();
if
(
null
!=
unEmpList
&&
!
unEmpList
.
isEmpty
())
{
List
<
String
>
idCardList
=
unEmpList
.
stream
().
map
(
TSalaryStandardUnprojectVo:
:
getEmpIdcard
).
collect
(
Collectors
.
toList
());
return
baseMapper
.
getSalaryStandardUnprojectList
(
page
,
salaryId
,
idCardList
);
...
...
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