高级搜索 当前使用模板
This commit is contained in:
parent
b58378854b
commit
af6b076584
|
|
@ -67,6 +67,8 @@ public interface HrmResourceMapper {
|
||||||
|
|
||||||
SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId);
|
SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId);
|
||||||
|
|
||||||
|
SearchTemplatePO getUsedSerarchTemplateByUser(@Param("userId") Integer userId);
|
||||||
|
|
||||||
SearchTemplatePO getOverallCustomTemplate();
|
SearchTemplatePO getOverallCustomTemplate();
|
||||||
|
|
||||||
Integer insertSearchTemplate(SearchTemplatePO templatePO);
|
Integer insertSearchTemplate(SearchTemplatePO templatePO);
|
||||||
|
|
@ -77,6 +79,8 @@ public interface HrmResourceMapper {
|
||||||
|
|
||||||
Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
|
Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
|
||||||
|
|
||||||
|
Integer updateCustomTemplateUsed(@Param("userId") Integer userId);
|
||||||
|
|
||||||
|
|
||||||
String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId, @Param("language") Integer language);
|
String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId, @Param("language") Integer language);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,9 @@
|
||||||
<result column="name" property="showname"/>
|
<result column="name" property="showname"/>
|
||||||
<!-- <result column="selected" property="selected"/>-->
|
<!-- <result column="selected" property="selected"/>-->
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
<update id="updateCustomTemplateUsed">
|
||||||
|
update JCL_ORG_SEARCH_TEMPLATE set isused = null where creator = #{userId}
|
||||||
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
|
<select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
|
||||||
|
|
@ -183,6 +186,9 @@
|
||||||
<if test="workFields != null">
|
<if test="workFields != null">
|
||||||
work_fields,
|
work_fields,
|
||||||
</if>
|
</if>
|
||||||
|
<if test="isused != null">
|
||||||
|
isused,
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
|
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
|
||||||
<if test="creator != null">
|
<if test="creator != null">
|
||||||
|
|
@ -206,6 +212,9 @@
|
||||||
<if test="workFields != null">
|
<if test="workFields != null">
|
||||||
#{workFields},
|
#{workFields},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="isused != null">
|
||||||
|
#{isused},
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|
@ -479,5 +488,12 @@
|
||||||
</foreach>
|
</foreach>
|
||||||
order by id
|
order by id
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getUsedSerarchTemplateByUser"
|
||||||
|
resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
|
||||||
|
select *
|
||||||
|
from jcl_org_search_template
|
||||||
|
where ISUSED = 1
|
||||||
|
and creator = #{userId}
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -273,6 +273,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
||||||
templatePO.setCreator(user.getUID());
|
templatePO.setCreator(user.getUID());
|
||||||
templatePO.setCreateTime(new Date());
|
templatePO.setCreateTime(new Date());
|
||||||
templatePO.setUpdateTime(new Date());
|
templatePO.setUpdateTime(new Date());
|
||||||
|
templatePO.setIsused("1");
|
||||||
|
// 将之前的模板,isused置为null
|
||||||
|
getHrmResourceMapper().updateCustomTemplateUsed(user.getUID());
|
||||||
getHrmResourceMapper().insertSearchTemplate(templatePO);
|
getHrmResourceMapper().insertSearchTemplate(templatePO);
|
||||||
return templatePO.getId();
|
return templatePO.getId();
|
||||||
}
|
}
|
||||||
|
|
@ -630,6 +633,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
||||||
btnDatas.put("loginId", user.getUID());
|
btnDatas.put("loginId", user.getUID());
|
||||||
//获取当前用户使用的列定制模板Id
|
//获取当前用户使用的列定制模板Id
|
||||||
btnDatas.put("customTemplateId", getCustomTemplateId());
|
btnDatas.put("customTemplateId", getCustomTemplateId());
|
||||||
|
btnDatas.put("searchTemplateId", getSearchTemplateId());
|
||||||
|
|
||||||
return btnDatas;
|
return btnDatas;
|
||||||
}
|
}
|
||||||
|
|
@ -656,6 +660,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
||||||
return customTemplateId;
|
return customTemplateId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取当前用户使用的查询模板Id
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private String getSearchTemplateId() {
|
||||||
|
|
||||||
|
String searchTemplateId = "-1";
|
||||||
|
SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedSerarchTemplateByUser(user.getUID());
|
||||||
|
if (null != usedCustomTemplate) {
|
||||||
|
searchTemplateId = usedCustomTemplate.getId().toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
return searchTemplateId;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Object> getTabForm(Map<String, Object> params) {
|
public Map<String, Object> getTabForm(Map<String, Object> params) {
|
||||||
Map<String, Object> apiDatas = new HashMap<>();
|
Map<String, Object> apiDatas = new HashMap<>();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue