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
1b11e5ad
Commit
1b11e5ad
authored
Mar 13, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
98ab2e3d
be4cdaba
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
12 deletions
+13
-12
TFascTemplateController.java
.../v1/yifu/archives/controller/TFascTemplateController.java
+3
-3
TFascTemplateMapper.java
...oud/plus/v1/yifu/archives/mapper/TFascTemplateMapper.java
+1
-1
TFascTemplateService.java
...d/plus/v1/yifu/archives/service/TFascTemplateService.java
+1
-1
TFascTemplateServiceImpl.java
.../yifu/archives/service/impl/TFascTemplateServiceImpl.java
+2
-2
TFascTemplateMapper.xml
...ves-biz/src/main/resources/mapper/TFascTemplateMapper.xml
+6
-5
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TFascTemplateController.java
View file @
1b11e5ad
...
...
@@ -89,9 +89,9 @@ public class TFascTemplateController {
/** 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
*/
@Operation
(
summary
=
"获取签署方的下拉框,模糊搜索,去重,皖信放第一位"
,
description
=
"获取签署方的下拉框,模糊搜索,去重,皖信放第一位"
)
@GetMapping
(
"/getSignName
List
"
)
public
R
<
List
<
String
>>
getSignNameList
(
@RequestParam
String
signName
)
{
return
R
.
ok
(
tFascTemplateService
.
getSignNameList
(
signName
));
@GetMapping
(
"/getSignName
Page
"
)
public
R
<
IPage
<
TFascTemplate
>>
getSignNamePage
(
Page
<
TFascTemplate
>
page
,
@RequestParam
(
required
=
false
)
String
signName
)
{
return
new
R
<>(
tFascTemplateService
.
getSignNamePage
(
page
,
signName
));
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TFascTemplateMapper.java
View file @
1b11e5ad
...
...
@@ -59,6 +59,6 @@ public interface TFascTemplateMapper extends BaseMapper<TFascTemplate> {
List
<
TFascTemplate
>
getTFascTemplateResutList
(
@Param
(
"templateId"
)
String
templateId
);
// 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
List
<
String
>
getSignNameList
(
@Param
(
"signName"
)
String
signName
);
IPage
<
TFascTemplate
>
getSignNamePage
(
Page
<
TFascTemplate
>
page
,
@Param
(
"signName"
)
String
signName
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TFascTemplateService.java
View file @
1b11e5ad
...
...
@@ -38,7 +38,7 @@ import java.util.List;
public
interface
TFascTemplateService
extends
IService
<
TFascTemplate
>
{
// 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
List
<
String
>
getSignNameList
(
String
signName
);
IPage
<
TFascTemplate
>
getSignNamePage
(
Page
<
TFascTemplate
>
page
,
String
signName
);
/**
* 法大大专业版模板表简单分页查询
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TFascTemplateServiceImpl.java
View file @
1b11e5ad
...
...
@@ -75,8 +75,8 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T
private
final
TFascTemplateDetailService
tFascTemplateDetailService
;
@Override
public
List
<
String
>
getSignNameList
(
String
signName
)
{
return
baseMapper
.
getSignName
List
(
signName
);
public
IPage
<
TFascTemplate
>
getSignNamePage
(
Page
<
TFascTemplate
>
page
,
String
signName
)
{
return
baseMapper
.
getSignName
Page
(
page
,
signName
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateMapper.xml
View file @
1b11e5ad
...
...
@@ -268,14 +268,15 @@
</select>
<!--获取签署方下拉列表-->
<select
id=
"getSignName
List"
resultType=
"java.lang.String
"
>
<select
id=
"getSignName
Page"
resultMap=
"tFascTemplateMap
"
>
SELECT
DISTINCT a.sign_name
FROM t_fasc_template a
where a.delete_flag = '0'
<if
test=
"signName != null and signName.trim() != ''"
>
AND a.sign_name like concat('%', #{signName}, '%')
</if>
<where>
a.delete_flag = '0'
<if
test=
"signName != null and signName.trim() != ''"
>
AND a.sign_name like concat('%', #{signName}, '%')
</if>
</where>
ORDER BY CASE WHEN a.sign_name = '安徽皖信人力资源管理有限公司' THEN 0 ELSE 1 END
,a.fasc_create_time ASC
</select>
...
...
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