Commit 49c9b2a2 authored by fangxinjiang's avatar fangxinjiang

事业部&事业部条线-fxj

parent c66c4e6f
...@@ -12,6 +12,7 @@ public class EmployeeConstants { ...@@ -12,6 +12,7 @@ public class EmployeeConstants {
public static final String VALIDITY_START = "身份证开始日期必填"; public static final String VALIDITY_START = "身份证开始日期必填";
public static final String VALIDITY_END = "身份证截止日期必填"; public static final String VALIDITY_END = "身份证截止日期必填";
public static final String VALIDITY_END_FORMAT = "身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"; 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 EMP_NATIONAL = "民族必填";
public static final String ID_PROVINCE = "户籍所在地必填"; public static final String ID_PROVINCE = "户籍所在地必填";
public static final String FILE_PROVINCE = "档案所在地(省市)必填"; public static final String FILE_PROVINCE = "档案所在地(省市)必填";
......
...@@ -169,4 +169,17 @@ public class SysMenu extends BaseEntity { ...@@ -169,4 +169,17 @@ public class SysMenu extends BaseEntity {
@Schema(description = "税务主体字段ID") @Schema(description = "税务主体字段ID")
private String taxId; private String taxId;
/**
* BU归属权限id
*/
@Schema(description = "事业部权限id")
private String divisionId;
/**
* 条线类型权限id
*/
@Schema(description = "事业部条线权限id")
private String divisionLineId;
} }
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
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
...@@ -6,6 +6,8 @@ import com.yifu.cloud.plus.v1.permission.service.SysMenuService; ...@@ -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.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; 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.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.SysMenuSearchVo;
import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo; import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
...@@ -14,6 +16,8 @@ import lombok.RequiredArgsConstructor; ...@@ -14,6 +16,8 @@ import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* 新权限-菜单表 * 新权限-菜单表
...@@ -107,5 +111,28 @@ public class SysMenuController { ...@@ -107,5 +111,28 @@ public class SysMenuController {
public R<IPage<SysTaxVo>> getSysTaxVoPage(Page<SysTaxVo> page, SysTaxVo vo) { public R<IPage<SysTaxVo>> getSysTaxVoPage(Page<SysTaxVo> page, SysTaxVo vo) {
return new R<>(sysMenuService.getSysTaxVoPage(page, 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());
}
} }
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu; 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.SysMenuSearchVo;
import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo; import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -63,4 +65,8 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> { ...@@ -63,4 +65,8 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
* @return: com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu * @return: com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu
**/ **/
SysMenu getSysMenuByModelId(@Param("modelId") String modelId); SysMenu getSysMenuByModelId(@Param("modelId") String modelId);
List<SysDivisionVo> getDivisions();
List<SysDivisionLineVo> getDivisionLines();
} }
...@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; 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.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.permission.entity.SysMenu; 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.SysMenuSearchVo;
import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo; import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo;
import java.util.List;
/** /**
* 新权限-菜单表 * 新权限-菜单表
* *
...@@ -44,4 +48,8 @@ public interface SysMenuService extends IService<SysMenu> { ...@@ -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> * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo>
**/ **/
IPage<SysTaxVo> getSysTaxVoPage(Page<SysTaxVo> page, SysTaxVo vo); IPage<SysTaxVo> getSysTaxVoPage(Page<SysTaxVo> page, SysTaxVo vo);
List<SysDivisionVo> getDivisions();
List<SysDivisionLineVo> getDivisionLines();
} }
...@@ -10,6 +10,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -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.Common;
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.permission.entity.SysMenu; 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.SysMenuSearchVo;
import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo; import com.yifu.cloud.plus.v1.yifu.permission.vo.SysTaxVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -159,5 +161,26 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl ...@@ -159,5 +161,26 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
return false; 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();
}
} }
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
<result property="tableName" column="TABLE_NAME"/> <result property="tableName" column="TABLE_NAME"/>
<result property="queryFields" column="QUERY_FIELDS"/> <result property="queryFields" column="QUERY_FIELDS"/>
<result property="taxId" column="TAX_ID"/> <result property="taxId" column="TAX_ID"/>
<result property="divisionId" column="DIVISION_ID"/>
<result property="divisionLineId" column="DIVISION_LINE_ID"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -57,7 +59,9 @@ ...@@ -57,7 +59,9 @@
a.CREATE_TIME, a.CREATE_TIME,
a.TABLE_NAME, a.TABLE_NAME,
a.QUERY_FIELDS, a.QUERY_FIELDS,
a.TAX_ID a.TAX_ID,
a.DIVISION_ID,
a.DIVISION_LINE_ID
</sql> </sql>
<sql id="sysMenu_where"> <sql id="sysMenu_where">
<if test="sysMenu != null"> <if test="sysMenu != null">
...@@ -130,5 +134,14 @@ ...@@ -130,5 +134,14 @@
</if> </if>
GROUP BY a.fd_3afab4c6755286 ORDER BY a.fd_3afab4c6755286 desc GROUP BY a.fd_3afab4c6755286 ORDER BY a.fd_3afab4c6755286 desc
</select> </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> </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