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
fdc556a6
Commit
fdc556a6
authored
Oct 30, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.16-合同审核,去除自动化电子签
parent
0d06bc0f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
4 deletions
+39
-4
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+1
-1
TEmployeeContractInfoMapper.java
.../v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
+8
-0
TEmployeeContractInfoService.java
...1/yifu/archives/service/TEmployeeContractInfoService.java
+3
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+10
-0
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+1
-1
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+16
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
fdc556a6
...
...
@@ -108,7 +108,7 @@ public class TEmployeeContractInfoController {
public
R
<
IPage
<
TEmployeeContractInfo
>>
getAuditPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
this
.
setAuth
(
tEmployeeContractInfo
);
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
));
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
ByAudit
(
page
,
tEmployeeContractInfo
));
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
View file @
fdc556a6
...
...
@@ -44,6 +44,14 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
/**
* 审核列表
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPageByAudit
(
Page
<
TEmployeeContractInfo
>
page
,
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
List
<
TEmployeeContractInfo
>
getTEmployeeContractList
(
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
List
<
EmployeeContractExportVO
>
getTEmployeeContractExport
(
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractInfoService.java
View file @
fdc556a6
...
...
@@ -46,6 +46,9 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
);
// 审核列表
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPageByAudit
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
);
/**
* @param tEmployeeContractInfo
* @Description: list
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
fdc556a6
...
...
@@ -126,6 +126,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
public
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
return
baseMapper
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
);
}
/**
* 审核列表
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
@Override
public
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPageByAudit
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
return
baseMapper
.
getTEmployeeContractInfoPageByAudit
(
page
,
tEmployeeContractInfo
);
}
@Override
public
List
<
TEmployeeContractInfo
>
getTEmployeeContractList
(
TEmployeeContractInfo
tEmployeeContractInfo
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
fdc556a6
...
...
@@ -55,7 +55,7 @@ public class FascUtil {
@Autowired
private
RedisTemplate
redisTemplate
;
@Autowired
//
@Autowired
//private FascConfig fascConfig;
private
static
final
String
DATA_COVER
=
"dataCover"
;
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
fdc556a6
...
...
@@ -445,6 +445,20 @@
</where>
order by a.APPLY_NO desc
</select>
<!--审核列表-->
<select
id=
"getTEmployeeContractInfoPageByAudit"
resultMap=
"tEmployeeContrctInfoMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_employee_contract_info a
<where>
a.DELETE_FLAG = 0 and (a.sign_type is null or a.sign_type = '1')
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
</if>
</where>
order by a.APPLY_NO desc
</select>
<!--list-->
<select
id=
"getTEmployeeContractList"
resultMap=
"tEmployeeContrctInfoMap"
>
...
...
@@ -675,7 +689,7 @@
left join (select REMARK,LINK_ID from t_employee_contract_audit where ROOT_NAME='合同审核') b on a.ID=b.LINK_ID
<where>
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
and (a.sign_type is null or a.sign_type = '1')
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
...
...
@@ -694,7 +708,7 @@
count(1)
FROM t_employee_contract_info a
<where>
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
and (a.sign_type is null or a.sign_type = '1')
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
...
...
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