diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/EbuilderBaseMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/EbuilderBaseMapper.java similarity index 96% rename from src/main/java/com/weaver/seconddev/portal/mapper/EbuilderBaseMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/EbuilderBaseMapper.java index 80267f9..d092f4c 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/EbuilderBaseMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/EbuilderBaseMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import com.weaver.common.form.datasource.FormdataTemplateDetails; import com.weaver.common.form.metadata.field.FormField; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/EmployeePortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/EmployeePortalMapper.java similarity index 76% rename from src/main/java/com/weaver/seconddev/portal/mapper/EmployeePortalMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/EmployeePortalMapper.java index bc5138b..62ad718 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/EmployeePortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/EmployeePortalMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/EteamsBaseMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/EteamsBaseMapper.java similarity index 94% rename from src/main/java/com/weaver/seconddev/portal/mapper/EteamsBaseMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/EteamsBaseMapper.java index 27ef9c7..8f4d95b 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/EteamsBaseMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/EteamsBaseMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import com.weaver.common.form.metadata.field.FormField; import com.weaver.seconddev.portal.entity.param.BaseParam; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/HrbpPortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java similarity index 97% rename from src/main/java/com/weaver/seconddev/portal/mapper/HrbpPortalMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java index 730a113..1e3f2ef 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/HrbpPortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import com.weaver.seconddev.portal.entity.param.HrbpParam; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/LeaderCockpitMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/LeaderCockpitMapper.java similarity index 98% rename from src/main/java/com/weaver/seconddev/portal/mapper/LeaderCockpitMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/LeaderCockpitMapper.java index c606633..9b9466d 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/LeaderCockpitMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/LeaderCockpitMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import com.weaver.seconddev.portal.entity.param.SearchConditionParam; import com.weaver.seconddev.portal.entity.po.PortalPO; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/ManagerPortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/ManagerPortalMapper.java similarity index 98% rename from src/main/java/com/weaver/seconddev/portal/mapper/ManagerPortalMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/ManagerPortalMapper.java index 977baa4..6e32eac 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/ManagerPortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/ManagerPortalMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import com.weaver.seconddev.portal.entity.param.BasicPersonnelParam; import com.weaver.seconddev.portal.entity.po.PieChartConfig; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/PortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/PortalMapper.java similarity index 89% rename from src/main/java/com/weaver/seconddev/portal/mapper/PortalMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/PortalMapper.java index c6d380e..e0fde60 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/PortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/PortalMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import com.weaver.seconddev.portal.entity.po.PortalUrlDetail; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/SscPortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/SscPortalMapper.java similarity index 93% rename from src/main/java/com/weaver/seconddev/portal/mapper/SscPortalMapper.java rename to src/main/java/com/weaver/seconddev/portal/mapper/portal/SscPortalMapper.java index 8fc1a85..3cb1be0 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/SscPortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/SscPortalMapper.java @@ -1,4 +1,4 @@ -package com.weaver.seconddev.portal.mapper; +package com.weaver.seconddev.portal.mapper.portal; import com.weaver.seconddev.portal.entity.param.SscParam; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/EmployeePortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/EmployeePortalServiceImpl.java index aac02ed..a76f220 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/EmployeePortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/EmployeePortalServiceImpl.java @@ -10,7 +10,7 @@ import com.weaver.common.hrm.dao.HrmCommonEmployeeDao; import com.weaver.seconddev.portal.entity.po.EmployeeBasicInfoPo; import com.weaver.seconddev.portal.entity.po.PortalUrlDetail; import com.weaver.seconddev.portal.enums.PersonnelStatusEnum; -import com.weaver.seconddev.portal.mapper.PortalMapper; +import com.weaver.seconddev.portal.mapper.portal.PortalMapper; import com.weaver.seconddev.portal.service.EmployeePortalService; import com.weaver.seconddev.portal.util.DateUtil; import com.weaver.teams.domain.department.SimpleDepartment; diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java index 8be6b6c..0c71b0e 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java @@ -3,8 +3,8 @@ package com.weaver.seconddev.portal.service.impl; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.seconddev.portal.entity.param.HrbpParam; import com.weaver.seconddev.portal.entity.po.PortalUrlDetail; -import com.weaver.seconddev.portal.mapper.HrbpPortalMapper; -import com.weaver.seconddev.portal.mapper.PortalMapper; +import com.weaver.seconddev.portal.mapper.portal.HrbpPortalMapper; +import com.weaver.seconddev.portal.mapper.portal.PortalMapper; import com.weaver.seconddev.portal.service.HrbpPortalService; import com.weaver.teams.security.context.UserContext; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java index 8bc4231..d40f778 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java @@ -10,7 +10,7 @@ import com.weaver.seconddev.portal.entity.param.SearchConditionParam; import com.weaver.seconddev.portal.entity.po.PortalData; import com.weaver.seconddev.portal.entity.po.PortalPO; import com.weaver.seconddev.portal.entity.po.cfg.*; -import com.weaver.seconddev.portal.mapper.LeaderCockpitMapper; +import com.weaver.seconddev.portal.mapper.portal.LeaderCockpitMapper; import com.weaver.seconddev.portal.service.LeaderCockpitService; import com.weaver.seconddev.portal.util.DateUtil; import com.weaver.teams.security.StringUtils; diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java index 3c5ca26..0deb040 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java @@ -14,10 +14,10 @@ import com.weaver.seconddev.portal.entity.po.PieChartConfig; import com.weaver.seconddev.portal.entity.po.PortalPO; import com.weaver.seconddev.portal.entity.po.PortalUrlDetail; import com.weaver.seconddev.portal.entity.po.TeamEmployeePo; -import com.weaver.seconddev.portal.mapper.EbuilderBaseMapper; -import com.weaver.seconddev.portal.mapper.LeaderCockpitMapper; -import com.weaver.seconddev.portal.mapper.ManagerPortalMapper; -import com.weaver.seconddev.portal.mapper.PortalMapper; +import com.weaver.seconddev.portal.mapper.portal.EbuilderBaseMapper; +import com.weaver.seconddev.portal.mapper.portal.LeaderCockpitMapper; +import com.weaver.seconddev.portal.mapper.portal.ManagerPortalMapper; +import com.weaver.seconddev.portal.mapper.portal.PortalMapper; import com.weaver.seconddev.portal.service.ManagerPortalService; import com.weaver.seconddev.portal.util.DateUtil; import com.weaver.seconddev.portal.util.StringUtil; diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java index 8cfe7b9..2efd439 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java @@ -4,8 +4,8 @@ import com.weaver.common.base.entity.result.WeaResult; import com.weaver.seconddev.portal.entity.param.SscParam; import com.weaver.seconddev.portal.entity.po.ExpirationReminderPo; import com.weaver.seconddev.portal.entity.po.PortalUrlDetail; -import com.weaver.seconddev.portal.mapper.PortalMapper; -import com.weaver.seconddev.portal.mapper.SscPortalMapper; +import com.weaver.seconddev.portal.mapper.portal.PortalMapper; +import com.weaver.seconddev.portal.mapper.portal.SscPortalMapper; import com.weaver.seconddev.portal.service.SscPortalService; import com.weaver.teams.security.context.UserContext; import com.weaver.teams.security.user.User; diff --git a/src/main/resources/mapper/EbuilderBaseMapper.xml b/src/main/resources/mapper/portal/EbuilderBaseMapper.xml similarity index 94% rename from src/main/resources/mapper/EbuilderBaseMapper.xml rename to src/main/resources/mapper/portal/EbuilderBaseMapper.xml index 2f7e00d..6336d56 100644 --- a/src/main/resources/mapper/EbuilderBaseMapper.xml +++ b/src/main/resources/mapper/portal/EbuilderBaseMapper.xml @@ -1,6 +1,6 @@ - + select t.form_id from ${param.eteams}.form_table t where diff --git a/src/main/resources/mapper/HrbpPortalMapper.xml b/src/main/resources/mapper/portal/HrbpPortalMapper.xml similarity index 98% rename from src/main/resources/mapper/HrbpPortalMapper.xml rename to src/main/resources/mapper/portal/HrbpPortalMapper.xml index ea9e470..05454bd 100644 --- a/src/main/resources/mapper/HrbpPortalMapper.xml +++ b/src/main/resources/mapper/portal/HrbpPortalMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/ManagerPortalMapper.xml b/src/main/resources/mapper/portal/ManagerPortalMapper.xml similarity index 99% rename from src/main/resources/mapper/ManagerPortalMapper.xml rename to src/main/resources/mapper/portal/ManagerPortalMapper.xml index d56770a..fd30110 100644 --- a/src/main/resources/mapper/ManagerPortalMapper.xml +++ b/src/main/resources/mapper/portal/ManagerPortalMapper.xml @@ -1,6 +1,6 @@ - + select t.id as id,t.jkbs as detailKey,t.ctdz as urlAddress,t.zjmc as detailName from e10_common.uf_mhctdz_mxb1 t diff --git a/src/main/resources/mapper/SscPortalMapper.xml b/src/main/resources/mapper/portal/SscPortalMapper.xml similarity index 97% rename from src/main/resources/mapper/SscPortalMapper.xml rename to src/main/resources/mapper/portal/SscPortalMapper.xml index 3ec088a..d421c60 100644 --- a/src/main/resources/mapper/SscPortalMapper.xml +++ b/src/main/resources/mapper/portal/SscPortalMapper.xml @@ -1,6 +1,6 @@ - +