Commit c4d31c10 authored by hongguangwu's avatar hongguangwu

1.7.21-法大大签署方

parent d1c089af
...@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascEditLog; import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascEditLog;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate; import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplateDetail;
import com.yifu.cloud.plus.v1.yifu.archives.service.TFascEditLogService; import com.yifu.cloud.plus.v1.yifu.archives.service.TFascEditLogService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateDetailService; import com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateDetailService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateService; import com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateService;
...@@ -87,6 +86,14 @@ public class TFascTemplateController { ...@@ -87,6 +86,14 @@ public class TFascTemplateController {
return R.ok(tFascTemplateService.noPageDiy(tFascTemplate)); return R.ok(tFascTemplateService.noPageDiy(tFascTemplate));
} }
/** 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
*/
@Operation(summary = "获取签署方的下拉框,模糊搜索,去重,皖信放第一位", description = "获取签署方的下拉框,模糊搜索,去重,皖信放第一位")
@GetMapping("/getSignNameList")
public R<List<String>> getSignNameList(@RequestParam String signName) {
return R.ok(tFascTemplateService.getSignNameList(signName));
}
/** /**
* 通过id查询法大大专业版模板表 * 通过id查询法大大专业版模板表
* *
......
...@@ -58,4 +58,7 @@ public interface TFascTemplateMapper extends BaseMapper<TFascTemplate> { ...@@ -58,4 +58,7 @@ public interface TFascTemplateMapper extends BaseMapper<TFascTemplate> {
**/ **/
List<TFascTemplate> getTFascTemplateResutList(@Param("templateId") String templateId); List<TFascTemplate> getTFascTemplateResutList(@Param("templateId") String templateId);
// 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
List<String> getSignNameList(@Param("signName") String signName);
} }
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
package com.yifu.cloud.plus.v1.yifu.archives.service; package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateSearchVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
...@@ -35,6 +36,10 @@ import java.util.List; ...@@ -35,6 +36,10 @@ import java.util.List;
* @date 2025-09-30 16:29:28 * @date 2025-09-30 16:29:28
*/ */
public interface TFascTemplateService extends IService<TFascTemplate> { public interface TFascTemplateService extends IService<TFascTemplate> {
// 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
List<String> getSignNameList(String signName);
/** /**
* 法大大专业版模板表简单分页查询 * 法大大专业版模板表简单分页查询
* @param tFascTemplate 法大大专业版模板表 * @param tFascTemplate 法大大专业版模板表
......
...@@ -74,6 +74,11 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T ...@@ -74,6 +74,11 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T
private final TFascTemplateDetailMapper tFascTemplateDetailMapper; private final TFascTemplateDetailMapper tFascTemplateDetailMapper;
private final TFascTemplateDetailService tFascTemplateDetailService; private final TFascTemplateDetailService tFascTemplateDetailService;
@Override
public List<String> getSignNameList(String signName) {
return baseMapper.getSignNameList(signName);
}
/** /**
* 法大大专业版模板表简单分页查询 * 法大大专业版模板表简单分页查询
* *
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
AND a.company_name like concat('%', #{tFascTemplate.companyName}, '%') AND a.company_name like concat('%', #{tFascTemplate.companyName}, '%')
</if> </if>
<if test="tFascTemplate.signName != null and tFascTemplate.signName.trim() != ''"> <if test="tFascTemplate.signName != null and tFascTemplate.signName.trim() != ''">
AND a.sign_name like concat('%', #{tFascTemplate.signName}, '%') AND a.sign_name = #{tFascTemplate.signName}
</if> </if>
<if test="tFascTemplate.signOpenId != null and tFascTemplate.signOpenId.trim() != ''"> <if test="tFascTemplate.signOpenId != null and tFascTemplate.signOpenId.trim() != ''">
AND a.sign_open_id = #{tFascTemplate.signOpenId} AND a.sign_open_id = #{tFascTemplate.signOpenId}
...@@ -267,4 +267,17 @@ ...@@ -267,4 +267,17 @@
</if> </if>
</select> </select>
<!--获取签署方下拉列表-->
<select id="getSignNameList" resultType="java.lang.String">
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>
ORDER BY CASE WHEN a.sign_name = '安徽皖信人力资源管理有限公司' THEN 0 ELSE 1 END
,a.fasc_create_time ASC
</select>
</mapper> </mapper>
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