Commit 1b11e5ad authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents 98ab2e3d be4cdaba
......@@ -89,9 +89,9 @@ public class TFascTemplateController {
/** 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
*/
@Operation(summary = "获取签署方的下拉框,模糊搜索,去重,皖信放第一位", description = "获取签署方的下拉框,模糊搜索,去重,皖信放第一位")
@GetMapping("/getSignNameList")
public R<List<String>> getSignNameList(@RequestParam String signName) {
return R.ok(tFascTemplateService.getSignNameList(signName));
@GetMapping("/getSignNamePage")
public R<IPage<TFascTemplate>> getSignNamePage(Page<TFascTemplate> page, @RequestParam(required = false) String signName) {
return new R<>(tFascTemplateService.getSignNamePage(page, signName));
}
/**
......
......@@ -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);
}
......@@ -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);
/**
* 法大大专业版模板表简单分页查询
......
......@@ -75,8 +75,8 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T
private final TFascTemplateDetailService tFascTemplateDetailService;
@Override
public List<String> getSignNameList(String signName) {
return baseMapper.getSignNameList(signName);
public IPage<TFascTemplate> getSignNamePage(Page<TFascTemplate> page, String signName) {
return baseMapper.getSignNamePage(page, signName);
}
/**
......
......@@ -268,14 +268,15 @@
</select>
<!--获取签署方下拉列表-->
<select id="getSignNameList" resultType="java.lang.String">
<select id="getSignNamePage" 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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment