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
b0374a4a
Commit
b0374a4a
authored
Dec 14, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2
parents
d41d4713
cf0dcfd3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
126 additions
and
16 deletions
+126
-16
TSettleDomainDataVo.java
...u/cloud/plus/v1/yifu/archives/vo/TSettleDomainDataVo.java
+46
-0
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+14
-0
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+3
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+48
-3
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+15
-13
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainDataVo.java
0 → 100644
View file @
b0374a4a
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author fxj
* @Date 2022/11/23
* @Description
* @Version 1.0
*/
@Data
public
class
TSettleDomainDataVo
implements
Serializable
{
/**
* 项目编码
*/
@Schema
(
description
=
"项目编码"
)
private
String
departNo
;
/**
* 项目档案在档人数
*/
@Schema
(
description
=
"项目档案在档人数"
)
private
long
projectNum
;
/**
* 合同在用数
*/
@Schema
(
description
=
"合同在用数"
)
private
long
contractNum
;
/**
* 社保在保人数
*/
@Schema
(
description
=
"社保在保人数"
)
private
long
socialNum
;
/**
* 公积金在保人数
*/
@Schema
(
description
=
"公积金在保人数"
)
private
long
fundNum
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
b0374a4a
...
...
@@ -24,6 +24,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainDataVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
...
...
@@ -391,4 +392,17 @@ public class TEmployeeProjectController {
public
R
selectInUseFundCount
(
@RequestBody
String
deptNo
)
{
return
tEmployeeProjectService
.
selectInUseFundCount
(
deptNo
);
}
/**
* 查询项目对应的数据
* @author hyc
* @param deptNoList
* @date 2022-12-12 17:45
* @return R
*/
@Operation
(
summary
=
"查询项目对应的数据"
,
description
=
"查询项目对应的数据"
)
@PostMapping
(
"/selectSettleMentData"
)
public
R
<
List
<
TSettleDomainDataVo
>>
selectSettleMentData
(
@RequestBody
List
<
String
>
deptNoList
)
{
return
tEmployeeProjectService
.
selectSettleMentData
(
deptNoList
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
b0374a4a
...
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainDataVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -233,4 +234,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
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 @
b0374a4a
...
...
@@ -62,7 +62,6 @@ import org.springframework.transaction.annotation.Transactional;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.lang.reflect.Field
;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.util.*
;
...
...
@@ -765,8 +764,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
));
//状态为草稿、已审核
if
(
Common
.
isNotNull
(
tEmployeeProject
)
&&
(
CommonConstants
.
ZERO_INT
==
tEmployeeProject
.
getStatus
()
||
CommonConstants
.
ONE_INT
==
tEmployeeProject
.
getStatus
()))
{
if
(
Common
.
isNotNull
(
tEmployeeProject
)
&&
CommonConstants
.
ZERO_INT
==
tEmployeeProject
.
getProjectStatus
())
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
EmployeeConstants
.
EXIT_PRIJECT_STATUS
));
}
//不存在复档或复项的情况
...
...
@@ -1460,4 +1458,51 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.
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
<>();
TSettleDomainDataVo
t
;
if
(
Common
.
isNotNull
(
deptNoList
))
{
for
(
String
deptNo:
deptNoList
)
{
t
=
new
TSettleDomainDataVo
();
t
.
setDepartNo
(
deptNo
);
//查询项目档案在档人数
long
projectNum
=
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
deptNo
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
));
t
.
setProjectNum
(
projectNum
);
//项目员工合同在用数
long
contractNum
=
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
));
t
.
setContractNum
(
contractNum
);
//查询社保在保人数
long
socialNum
=
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
)));
t
.
setSocialNum
(
socialNum
);
//查询公积金在保人数
long
fundNum
=
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
)));
t
.
setFundNum
(
fundNum
);
list
.
add
(
t
);
}
return
R
.
ok
(
list
);
}
else
{
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
}
}
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
b0374a4a
dapr.upms.appUrl
=
http://localhost:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883-\u7BA1\u7406\u540E\u53F0
dapr.upms.appUrl
=
http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.upms.appId
=
yifu-upms
#\u6D4B\u8BD5\u73AF\u5883
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883-\u6821\u9A8C\u670D\u52A1
dapr.check.appUrl
=
http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
dapr.check.appUrl
=
http://localhost:3507
/v1.0/invoke/
#dapr.check.appUrl=http://localhost:3502
/v1.0/invoke/
dapr.check.appId
=
yifu-check
#\u672C\u5730
dapr.archives.appUrl
=
http://localhost:3508/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883-\u6863\u6848\u670D\u52A1
dapr.archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
dapr.insurances.appUrl
=
http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
dapr.social.appUrl
=
http://localhost:3510/v1.0/invoke/
dapr.social.appId
=
yifu-social
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
dapr.salary.appUrl
=
http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.salary.appId
=
yifu-salary
#\u6
72C\u5730
dapr.
mail.appUrl
=
http://localhost:3524
/v1.0/invoke/
dapr.
mail.appId
=
yifu-mai
l
#\u6
D4B\u8BD5\u73AF\u5883-\u793E\u4FDD\u670D\u52A1
dapr.
social.appUrl
=
http://yifu-social.qas-mvp.svc.cluster.local:3500
/v1.0/invoke/
dapr.
social.appId
=
yifu-socia
l
\ No newline at end of file
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