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
c370753b
You need to sign in or sign up before continuing.
Commit
c370753b
authored
Jul 21, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同相关\社保公积金相关
parent
b758db33
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
14 deletions
+11
-14
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+2
-2
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+1
-1
TAuditInfo.java
...com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java
+2
-4
TAuditInfoServiceImpl.java
...us/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java
+5
-6
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
c370753b
...
@@ -251,8 +251,8 @@ public class TEmployeeInfoController {
...
@@ -251,8 +251,8 @@ public class TEmployeeInfoController {
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
**/
**/
@Inner
@Inner
@
Ge
tMapping
(
"/inner/getByEmpId"
)
@
Pos
tMapping
(
"/inner/getByEmpId"
)
public
TEmployeeInfo
getByEmpId
(
@Request
Param
String
empId
)
{
public
TEmployeeInfo
getByEmpId
(
@Request
Body
String
empId
)
{
return
tEmployeeInfoService
.
getById
(
empId
);
return
tEmployeeInfoService
.
getById
(
empId
);
}
}
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
c370753b
...
@@ -118,7 +118,7 @@ public class ArchivesDaprUtil {
...
@@ -118,7 +118,7 @@ public class ArchivesDaprUtil {
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
**/
**/
public
R
<
TEmployeeInfo
>
getTEmployeeInfoById
(
String
empId
)
{
public
R
<
TEmployeeInfo
>
getTEmployeeInfoById
(
String
empId
)
{
R
<
TEmployeeInfo
>
res
=
HttpDaprUtil
.
invokeMethod
Ge
t
(
R
<
TEmployeeInfo
>
res
=
HttpDaprUtil
.
invokeMethod
Pos
t
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
()
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
()
,
"/temployeeinfo/inner/getByEmpId"
,
empId
,
TEmployeeInfo
.
class
,
SecurityConstants
.
FROM_IN
);
,
"/temployeeinfo/inner/getByEmpId"
,
empId
,
TEmployeeInfo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
if
(
Common
.
isEmpty
(
res
)){
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java
View file @
c370753b
...
@@ -21,13 +21,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
...
@@ -21,13 +21,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
...
@@ -38,9 +37,8 @@ import java.util.Date;
...
@@ -38,9 +37,8 @@ import java.util.Date;
*/
*/
@Data
@Data
@TableName
(
"t_audit_info"
)
@TableName
(
"t_audit_info"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
"审核信息表(社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录)"
)
@Schema
(
description
=
"审核信息表(社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录)"
)
public
class
TAuditInfo
extends
BaseEntity
{
public
class
TAuditInfo
implements
Serializable
{
/**
/**
* 主键
* 主键
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java
View file @
c370753b
...
@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
...
@@ -141,7 +140,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
...
@@ -141,7 +140,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
if
(
searchVo
.
getLimitStart
()
>=
0
&&
searchVo
.
getLimitEnd
()
>
0
){
if
(
searchVo
.
getLimitStart
()
>=
0
&&
searchVo
.
getLimitEnd
()
>
0
){
wrapper
.
last
(
" limit "
+
searchVo
.
getLimitStart
()
+
","
+
searchVo
.
getLimitEnd
());
wrapper
.
last
(
" limit "
+
searchVo
.
getLimitStart
()
+
","
+
searchVo
.
getLimitEnd
());
}
}
wrapper
.
orderByDesc
(
BaseEntity:
:
getCreate
Time
);
wrapper
.
orderByDesc
(
TAuditInfo:
:
getAudit
Time
);
return
baseMapper
.
selectList
(
wrapper
);
return
baseMapper
.
selectList
(
wrapper
);
}
}
...
@@ -157,12 +156,12 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
...
@@ -157,12 +156,12 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
private
LambdaQueryWrapper
buildQueryWrapper
(
TAuditInfoSearchVo
entity
){
private
LambdaQueryWrapper
buildQueryWrapper
(
TAuditInfoSearchVo
entity
){
LambdaQueryWrapper
<
TAuditInfo
>
wrapper
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
TAuditInfo
>
wrapper
=
Wrappers
.
lambdaQuery
();
if
(
ArrayUtil
.
isNotEmpty
(
entity
.
getCreateTimes
()))
{
if
(
ArrayUtil
.
isNotEmpty
(
entity
.
getCreateTimes
()))
{
wrapper
.
ge
(
TAuditInfo:
:
get
Create
Time
,
entity
.
getCreateTimes
()[
0
])
wrapper
.
ge
(
TAuditInfo:
:
get
Audit
Time
,
entity
.
getCreateTimes
()[
0
])
.
le
(
TAuditInfo:
:
get
Create
Time
,
.
le
(
TAuditInfo:
:
get
Audit
Time
,
entity
.
getCreateTimes
()[
1
]);
entity
.
getCreateTimes
()[
1
]);
}
}
if
(
Common
.
isNotNull
(
entity
.
get
CreateName
())){
if
(
Common
.
isNotNull
(
entity
.
get
AuditUser
())){
wrapper
.
eq
(
TAuditInfo:
:
get
CreateName
,
entity
.
getCreateName
());
wrapper
.
eq
(
TAuditInfo:
:
get
AuditUser
,
entity
.
getAuditUser
());
}
}
return
wrapper
;
return
wrapper
;
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
c370753b
...
@@ -324,7 +324,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
...
@@ -324,7 +324,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
// 流程进展明细
// 流程进展明细
List
<
TAuditInfo
>
auditInfoList
=
tAuditInfoService
.
list
(
Wrappers
.<
TAuditInfo
>
query
().
lambda
()
List
<
TAuditInfo
>
auditInfoList
=
tAuditInfoService
.
list
(
Wrappers
.<
TAuditInfo
>
query
().
lambda
()
.
eq
(
TAuditInfo:
:
getEmpIdcard
,
socialFundInfo
.
getEmpIdcard
())
.
eq
(
TAuditInfo:
:
getEmpIdcard
,
socialFundInfo
.
getEmpIdcard
())
.
orderByDesc
(
TAuditInfo:
:
get
Create
Time
));
.
orderByDesc
(
TAuditInfo:
:
get
Audit
Time
));
detailVo
.
setAuditList
(
auditInfoList
);
detailVo
.
setAuditList
(
auditInfoList
);
}
}
return
detailVo
;
return
detailVo
;
...
...
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