1、增加职位、行业的列表接口

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/AreaController.java

@@ -81,7 +81,7 @@ public class AreaController {
     @GetMapping("/list")
     @Operation(summary = "获得地区列表")
     @PreAuthorize("@ss.hasPermission('menduner:system:area:query')")
-    public CommonResult<List<AreaRespVO>> getDemo02CategoryList(@Valid AreaListReqVO listReqVO) {
+    public CommonResult<List<AreaRespVO>> getAreaList(@Valid AreaListReqVO listReqVO) {
         List<AreaDO> list = areaService.getAreaList(listReqVO);
         return success(BeanUtils.toBean(list, AreaRespVO.class));
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/industry/IndustryController.java

@@ -6,9 +6,11 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
+import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryPageReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryRespVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustrySaveReqVO;
+
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.service.industry.IndustryService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -39,14 +41,14 @@ public class IndustryController {
 
     @PostMapping("/create")
     @Operation(summary = "创建行业信息")
-    @PreAuthorize("@ss.hasPermission('mde:industry:create')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:industry:create')")
     public CommonResult<Long> createIndustry(@Valid @RequestBody IndustrySaveReqVO createReqVO) {
         return success(industryService.createIndustry(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新行业信息")
-    @PreAuthorize("@ss.hasPermission('mde:industry:update')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:industry:update')")
     public CommonResult<Boolean> updateIndustry(@Valid @RequestBody IndustrySaveReqVO updateReqVO) {
         industryService.updateIndustry(updateReqVO);
         return success(true);
@@ -55,7 +57,7 @@ public class IndustryController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除行业信息")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mde:industry:delete')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:industry:delete')")
     public CommonResult<Boolean> deleteIndustry(@RequestParam("id") Long id) {
         industryService.deleteIndustry(id);
         return success(true);
@@ -64,7 +66,7 @@ public class IndustryController {
     @GetMapping("/get")
     @Operation(summary = "获得行业信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('mde:industry:query')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:industry:query')")
     public CommonResult<IndustryRespVO> getIndustry(@RequestParam("id") Long id) {
         IndustryDO industry = industryService.getIndustry(id);
         return success(BeanUtils.toBean(industry, IndustryRespVO.class));
@@ -72,15 +74,23 @@ public class IndustryController {
 
     @GetMapping("/page")
     @Operation(summary = "获得行业信息分页")
-    @PreAuthorize("@ss.hasPermission('mde:industry:query')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:industry:query')")
     public CommonResult<PageResult<IndustryRespVO>> getIndustryPage(@Valid IndustryPageReqVO pageReqVO) {
         PageResult<IndustryDO> pageResult = industryService.getIndustryPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, IndustryRespVO.class));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得行业信息列表")
+    @PreAuthorize("@ss.hasPermission('menduner:system:Industry:query')")
+    public CommonResult<List<IndustryRespVO>> getIndustryList(@Valid IndustryListReqVO listReqVO) {
+        List<IndustryDO> list = industryService.getIndustryList(listReqVO);
+        return success(BeanUtils.toBean(list, IndustryRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出行业信息 Excel")
-    @PreAuthorize("@ss.hasPermission('mde:industry:export')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:industry:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportIndustryExcel(@Valid IndustryPageReqVO pageReqVO,
                                     HttpServletResponse response) throws IOException {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/industry/vo/IndustryListReqVO.java

@@ -0,0 +1,31 @@
+package com.citu.module.menduner.system.controller.admin.industry.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 行业信息列表 Request VO")
+@Data
+public class IndustryListReqVO {
+
+    @Schema(description = "行业中文名称")
+    private String nameCn;
+
+    @Schema(description = "行业英文名称")
+    private String nameEn;
+
+    @Schema(description = "上级id", example = "11085")
+    private Long parentId;
+
+    @Schema(description = "层级")
+    private Integer level;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/position/PositionController.java

@@ -6,6 +6,7 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
+import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionPageReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionRespVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionSaveReqVO;
@@ -77,6 +78,14 @@ public class PositionController {
         return success(BeanUtils.toBean(pageResult, PositionRespVO.class));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得职位信息列表")
+    @PreAuthorize("@ss.hasPermission('menduner:system:position:query')")
+    public CommonResult<List<PositionRespVO>> getPositionList(@Valid PositionListReqVO listReqVO) {
+        List<PositionDO> list = positionService.getPositionList(listReqVO);
+        return success(BeanUtils.toBean(list, PositionRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出职位信息 Excel")
     @PreAuthorize("@ss.hasPermission('menduner:system:position:export')")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/position/vo/PositionListReqVO.java

@@ -0,0 +1,31 @@
+package com.citu.module.menduner.system.controller.admin.position.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 职位信息列表 Request VO")
+@Data
+public class PositionListReqVO {
+
+    @Schema(description = "职位中文名称")
+    private String nameCn;
+
+    @Schema(description = "职位英文名称")
+    private String nameEn;
+
+    @Schema(description = "上级id", example = "11085")
+    private Long parentId;
+
+    @Schema(description = "层级")
+    private Integer level;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/industry/IndustryMapper.java

@@ -3,10 +3,13 @@ package com.citu.module.menduner.system.dal.mysql.industry;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 
 /**
  * 行业信息 Mapper
@@ -21,7 +24,15 @@ public interface IndustryMapper extends BaseMapperX<IndustryDO> {
                 .eqIfPresent(IndustryDO::getNameCn, reqVO.getNameCn())
                 .eqIfPresent(IndustryDO::getNameEn, reqVO.getNameEn())
                 .betweenIfPresent(IndustryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(IndustryDO::getId));
+                .orderByDesc(IndustryDO::getUpdateTime));
+    }
+
+    default List<IndustryDO> selectList(IndustryListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IndustryDO>()
+                .eqIfPresent(IndustryDO::getNameCn, reqVO.getNameCn())
+                .eqIfPresent(IndustryDO::getNameEn, reqVO.getNameEn())
+                .betweenIfPresent(IndustryDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IndustryDO::getUpdateTime));
     }
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/position/PositionMapper.java

@@ -3,10 +3,13 @@ package com.citu.module.menduner.system.dal.mysql.position;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 职位信息 Mapper
  *
@@ -25,4 +28,14 @@ public interface PositionMapper extends BaseMapperX<PositionDO> {
                 .orderByDesc(PositionDO::getId));
     }
 
+    default List<PositionDO> selectList(PositionListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<PositionDO>()
+                .eqIfPresent(PositionDO::getNameCn, reqVO.getNameCn())
+                .eqIfPresent(PositionDO::getNameEn, reqVO.getNameEn())
+                .eqIfPresent(PositionDO::getParentId, reqVO.getParentId())
+                .eqIfPresent(PositionDO::getLevel, reqVO.getLevel())
+                .betweenIfPresent(PositionDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(PositionDO::getId));
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryService.java

@@ -1,11 +1,13 @@
 package com.citu.module.menduner.system.service.industry;
 
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryPageReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustrySaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 行业信息 Service 接口
@@ -52,4 +54,12 @@ public interface IndustryService {
      */
     PageResult<IndustryDO> getIndustryPage(IndustryPageReqVO pageReqVO);
 
+    /**
+     * 获得行业信息劣列表
+     *
+     * @param pageReqVO 分页查询
+     * @return 行业信息分页
+     */
+    List<IndustryDO> getIndustryList(IndustryListReqVO pageReqVO);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryServiceImpl.java

@@ -2,6 +2,7 @@ package com.citu.module.menduner.system.service.industry;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryPageReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustrySaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
@@ -12,6 +13,9 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.Collections;
+import java.util.List;
+
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.INDUSTRY_NOT_EXISTS;
 
@@ -70,4 +74,8 @@ public class IndustryServiceImpl implements IndustryService {
         return industryMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<IndustryDO> getIndustryPage(IndustryListReqVO pageReqVO) {
+        return industryMapper.selectList(pageReqVO);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionService.java

@@ -5,6 +5,8 @@ import com.citu.module.menduner.system.controller.admin.position.vo.*;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import com.citu.framework.common.pojo.PageResult;
 
+import java.util.List;
+
 /**
  * 职位信息 Service 接口
  *
@@ -50,4 +52,11 @@ public interface PositionService {
      */
     PageResult<PositionDO> getPositionPage(PositionPageReqVO pageReqVO);
 
+    /**
+     * 获得职位信息列表
+     *
+     * @param pageReqVO 分页查询
+     * @return 职位信息分页
+     */
+    List<PositionDO> getPositionList(PositionListReqVO pageReqVO);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionServiceImpl.java

@@ -2,6 +2,7 @@ package com.citu.module.menduner.system.service.position;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionPageReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
@@ -11,6 +12,9 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.Collections;
+import java.util.List;
+
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.POSITION_NOT_EXISTS;
 
@@ -68,4 +72,8 @@ public class PositionServiceImpl implements PositionService {
         return positionMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<PositionDO> getPositionList(PositionListReqVO pageReqVO) {
+        return positionMapper.selectList(pageReqVO);
+    }
 }