Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
49c9b2a2
Commit
49c9b2a2
authored
Feb 05, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
事业部&事业部条线-fxj
parent
c66c4e6f
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
138 additions
and
3 deletions
+138
-3
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-0
SysMenu.java
...om/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java
+13
-0
SysDivisionLineVo.java
...u/cloud/plus/v1/yifu/permission/vo/SysDivisionLineVo.java
+22
-0
SysDivisionVo.java
.../yifu/cloud/plus/v1/yifu/permission/vo/SysDivisionVo.java
+22
-0
SysMenuController.java
...loud/plus/v1/permission/controller/SysMenuController.java
+28
-1
SysMenuMapper.java
...m/yifu/cloud/plus/v1/permission/mapper/SysMenuMapper.java
+6
-0
SysMenuService.java
...yifu/cloud/plus/v1/permission/service/SysMenuService.java
+8
-0
SysMenuServiceImpl.java
...d/plus/v1/permission/service/impl/SysMenuServiceImpl.java
+24
-1
SysMenuMapper.xml
...ermission-biz/src/main/resources/mapper/SysMenuMapper.xml
+14
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
49c9b2a2
...
...
@@ -12,6 +12,7 @@ public class EmployeeConstants {
public
static
final
String
VALIDITY_START
=
"身份证开始日期必填"
;
public
static
final
String
VALIDITY_END
=
"身份证截止日期必填"
;
public
static
final
String
VALIDITY_END_FORMAT
=
"身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"
;
public
static
final
String
EMP_VALIDITY_END_START_DATE
=
"身份证截止日期必须大于身份证开始日期"
;
public
static
final
String
EMP_NATIONAL
=
"民族必填"
;
public
static
final
String
ID_PROVINCE
=
"户籍所在地必填"
;
public
static
final
String
FILE_PROVINCE
=
"档案所在地(省市)必填"
;
...
...
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java
View file @
49c9b2a2
...
...
@@ -169,4 +169,17 @@ public class SysMenu extends BaseEntity {
@Schema
(
description
=
"税务主体字段ID"
)
private
String
taxId
;
/**
* BU归属权限id
*/
@Schema
(
description
=
"事业部权限id"
)
private
String
divisionId
;
/**
* 条线类型权限id
*/
@Schema
(
description
=
"事业部条线权限id"
)
private
String
divisionLineId
;
}
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/vo/SysDivisionLineVo.java
0 → 100644
View file @
49c9b2a2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
permission
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 税务主体
* @author hgw
* @date 2024-1-10 18:05:30
*/
@Data
public
class
SysDivisionLineVo
implements
Serializable
{
/**
* 名称
*/
@Schema
(
description
=
"名称"
)
private
String
name
;
}
\ No newline at end of file
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/vo/SysDivisionVo.java
0 → 100644
View file @
49c9b2a2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
permission
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 税务主体
* @author hgw
* @date 2024-1-10 18:05:30
*/
@Data
public
class
SysDivisionVo
implements
Serializable
{
/**
* 名称
*/
@Schema
(
description
=
"名称"
)
private
String
name
;
}
\ No newline at end of file
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysMenuController.java
View file @
49c9b2a2
...
...
@@ -6,6 +6,8 @@ import com.yifu.cloud.plus.v1.permission.service.SysMenuService;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionLineVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
import
io.swagger.v3.oas.annotations.Operation
;
...
...
@@ -14,6 +16,8 @@ import lombok.RequiredArgsConstructor;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
* 新权限-菜单表
...
...
@@ -107,5 +111,28 @@ public class SysMenuController {
public
R
<
IPage
<
SysTaxVo
>>
getSysTaxVoPage
(
Page
<
SysTaxVo
>
page
,
SysTaxVo
vo
)
{
return
new
R
<>(
sysMenuService
.
getSysTaxVoPage
(
page
,
vo
));
}
/**
* @Author fxj
* @Description 获取“事业部”信息
* @Date 9:52 2025/2/5
* @Param
* @return
**/
@Operation
(
description
=
"获取事业部信息"
)
@GetMapping
(
"/getDivisions"
)
public
R
<
List
<
SysDivisionVo
>>
getDivisions
(
Page
<
SysMenu
>
page
,
SysMenuSearchVo
sysMenu
)
{
return
new
R
<>(
sysMenuService
.
getDivisions
());
}
/**
* @Author fxj
* @Description 获取“事业部条线”信息
* @Date 9:52 2025/2/5
* @Param
* @return
**/
@Operation
(
description
=
"获取事业部条线信息"
)
@GetMapping
(
"/getDivisionLines"
)
public
R
<
List
<
SysDivisionLineVo
>>
getDivisionLines
(
Page
<
SysMenu
>
page
,
SysMenuSearchVo
sysMenu
)
{
return
new
R
<>(
sysMenuService
.
getDivisionLines
());
}
}
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/mapper/SysMenuMapper.java
View file @
49c9b2a2
...
...
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionLineVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
import
org.apache.ibatis.annotations.Mapper
;
...
...
@@ -63,4 +65,8 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
* @return: com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
**/
SysMenu
getSysMenuByModelId
(
@Param
(
"modelId"
)
String
modelId
);
List
<
SysDivisionVo
>
getDivisions
();
List
<
SysDivisionLineVo
>
getDivisionLines
();
}
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/SysMenuService.java
View file @
49c9b2a2
...
...
@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionLineVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
import
java.util.List
;
/**
* 新权限-菜单表
*
...
...
@@ -44,4 +48,8 @@ public interface SysMenuService extends IService<SysMenu> {
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo>
**/
IPage
<
SysTaxVo
>
getSysTaxVoPage
(
Page
<
SysTaxVo
>
page
,
SysTaxVo
vo
);
List
<
SysDivisionVo
>
getDivisions
();
List
<
SysDivisionLineVo
>
getDivisionLines
();
}
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysMenuServiceImpl.java
View file @
49c9b2a2
...
...
@@ -10,6 +10,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionLineVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysMenuSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -159,5 +161,26 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
return
false
;
}
}
/**
* @Author fxj
* @Description 获取“事业部”信息
* @Date 9:50 2025/2/5
* @Param
* @return
**/
@Override
public
List
<
SysDivisionVo
>
getDivisions
()
{
return
baseMapper
.
getDivisions
();
}
/**
* @Author fxj
* @Description 获取“事业部条线”信息
* @Date 9:50 2025/2/5
* @Param
* @return
**/
@Override
public
List
<
SysDivisionLineVo
>
getDivisionLines
()
{
return
baseMapper
.
getDivisionLines
();
}
}
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml
View file @
49c9b2a2
...
...
@@ -32,6 +32,8 @@
<result
property=
"tableName"
column=
"TABLE_NAME"
/>
<result
property=
"queryFields"
column=
"QUERY_FIELDS"
/>
<result
property=
"taxId"
column=
"TAX_ID"
/>
<result
property=
"divisionId"
column=
"DIVISION_ID"
/>
<result
property=
"divisionLineId"
column=
"DIVISION_LINE_ID"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -57,7 +59,9 @@
a.CREATE_TIME,
a.TABLE_NAME,
a.QUERY_FIELDS,
a.TAX_ID
a.TAX_ID,
a.DIVISION_ID,
a.DIVISION_LINE_ID
</sql>
<sql
id=
"sysMenu_where"
>
<if
test=
"sysMenu != null"
>
...
...
@@ -130,5 +134,14 @@
</if>
GROUP BY a.fd_3afab4c6755286 ORDER BY a.fd_3afab4c6755286 desc
</select>
<!-- 获取事业部-->
<select
id=
"getDivisions"
resultType=
"com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionVo"
>
select fd_shiyebu,fd_tiaoxian from ekp_shenhepeizhi_table
</select>
<!-- 获取事业部条线-->
<select
id=
"getDivisionLines"
resultType=
"com.yifu.cloud.plus.v1.yifu.permission.vo.SysDivisionLineVo"
>
select fd_shiyebu,fd_tiaoxian from ekp_shenhepeizhi_table
</select>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment