From ec84cd6ccf2fabb9e9b86eacfeb630d44ad78d85 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 24 Jul 2024 15:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmresource/po/SearchTemplatePO.java | 1 + .../mapper/resource/HrmResourceMapper.java | 4 ++ .../mapper/resource/HrmResourceMapper.xml | 17 ++++++ .../resource/JclOrgCustomTemplateMapper.java | 4 +- .../resource/JclOrgCustomTemplateMapper.xml | 13 +++- .../service/HrmResourceService.java | 8 +++ .../service/impl/HrmResourceServiceImpl.java | 61 ++++++++++++++++--- .../web/HrmResourceController.java | 14 +++++ .../wrapper/HrmResourceWrapper.java | 4 ++ 9 files changed, 115 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java b/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java index 4393a206..6fd748ca 100644 --- a/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java +++ b/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java @@ -26,4 +26,5 @@ public class SearchTemplatePO { private Integer creator; private Date createTime; private Date updateTime; + private Integer overall; } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index 5e6039bc..816b1be1 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -55,6 +55,8 @@ public interface HrmResourceMapper { */ List getCustomTemplatesByUser(@Param("userId") Integer userId); + List getCustomOverAll(); + SearchTemplatePO getSearchTemplateById(@Param("id") String id); SearchTemplatePO getSearchTemplateByName(@Param("userId") Integer userId, @Param("name") String name); @@ -65,6 +67,8 @@ public interface HrmResourceMapper { SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId); + SearchTemplatePO getOverallCustomTemplate(); + Integer insertSearchTemplate(SearchTemplatePO templatePO); Integer deleteSearchTemplate(@Param("id") Integer Id, @Param("userId") Integer userId); diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index 8097bea6..fd4847dc 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -150,6 +150,13 @@ where creator = #{userId} + + @@ -445,9 +452,19 @@ select * from jcl_org_custom_template where ISUSED = 1 + and overall = 0 and creator = #{userId} + + + + + + + +