1、更改实体名称 people更改为people

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/PeopleCertificateController.java

@@ -1,96 +0,0 @@
-package com.citu.module.menduner.system.controller.admin.people;
-
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificatePageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificateRespVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificateSaveReqVO;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.citu.framework.common.pojo.PageParam;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.common.util.object.BeanUtils;
-import static com.citu.framework.common.pojo.CommonResult.success;
-
-import com.citu.framework.excel.core.util.ExcelUtils;
-
-import com.citu.framework.apilog.core.annotation.ApiAccessLog;
-import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleCertificateDO;
-import com.citu.module.menduner.system.service.people.PeopleCertificateService;
-
-@Tag(name = "管理后台 - 人员证书")
-@RestController
-@RequestMapping("/menduner/system/people-certificate")
-@Validated
-public class PeopleCertificateController {
-
-    @Resource
-    private PeopleCertificateService peopleCertificateService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建人员证书")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-certificate:create')")
-    public CommonResult<Long> createUserCertificate(@Valid @RequestBody PeopleCertificateSaveReqVO createReqVO) {
-        return success(peopleCertificateService.createUserCertificate(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新人员证书")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-certificate:update')")
-    public CommonResult<Boolean> updateUserCertificate(@Valid @RequestBody PeopleCertificateSaveReqVO updateReqVO) {
-        peopleCertificateService.updateUserCertificate(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除人员证书")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-certificate:delete')")
-    public CommonResult<Boolean> deleteUserCertificate(@RequestParam("id") Long id) {
-        peopleCertificateService.deleteUserCertificate(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得人员证书")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-certificate:query')")
-    public CommonResult<PeopleCertificateRespVO> getUserCertificate(@RequestParam("id") Long id) {
-        PeopleCertificateDO userCertificate = peopleCertificateService.getUserCertificate(id);
-        return success(BeanUtils.toBean(userCertificate, PeopleCertificateRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得人员证书分页")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-certificate:query')")
-    public CommonResult<PageResult<PeopleCertificateRespVO>> getUserCertificatePage(@Valid PeopleCertificatePageReqVO pageReqVO) {
-        PageResult<PeopleCertificateDO> pageResult = peopleCertificateService.getUserCertificatePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PeopleCertificateRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出人员证书 Excel")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-certificate:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportUserCertificateExcel(@Valid PeopleCertificatePageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PeopleCertificateDO> list = peopleCertificateService.getUserCertificatePage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "人员证书.xls", "数据", PeopleCertificateRespVO.class,
-                        BeanUtils.toBean(list, PeopleCertificateRespVO.class));
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/PeopleInfoController.java

@@ -1,93 +0,0 @@
-package com.citu.module.menduner.system.controller.admin.people;
-
-import com.citu.framework.apilog.core.annotation.ApiAccessLog;
-import com.citu.framework.common.pojo.CommonResult;
-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.dal.dataobject.people.PeopleInfoDO;
-import com.citu.module.menduner.system.service.people.PeopleInfoService;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoRespVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoSaveReqVO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static com.citu.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 人员信息-个人档案")
-@RestController
-@RequestMapping("/menduner/system/people-info")
-@Validated
-public class PeopleInfoController {
-
-    @Resource
-    private PeopleInfoService peopleInfoService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建人员信息-个人档案")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-info:create')")
-    public CommonResult<Long> createUserInfo(@Valid @RequestBody PeopleInfoSaveReqVO createReqVO) {
-        return success(peopleInfoService.createUserInfo(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新人员信息-个人档案")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-info:update')")
-    public CommonResult<Boolean> updateUserInfo(@Valid @RequestBody PeopleInfoSaveReqVO updateReqVO) {
-        peopleInfoService.updateUserInfo(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除人员信息-个人档案")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-info:delete')")
-    public CommonResult<Boolean> deleteUserInfo(@RequestParam("id") Long id) {
-        peopleInfoService.deleteUserInfo(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得人员信息-个人档案")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-info:query')")
-    public CommonResult<PeopleInfoRespVO> getUserInfo(@RequestParam("id") Long id) {
-        PeopleInfoDO userInfo = peopleInfoService.getUserInfo(id);
-        return success(BeanUtils.toBean(userInfo, PeopleInfoRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得人员信息-个人档案分页")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-info:query')")
-    public CommonResult<PageResult<PeopleInfoRespVO>> getUserInfoPage(@Valid PeopleInfoPageReqVO pageReqVO) {
-        PageResult<PeopleInfoDO> pageResult = peopleInfoService.getUserInfoPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PeopleInfoRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出人员信息-个人档案 Excel")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-info:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportUserInfoExcel(@Valid PeopleInfoPageReqVO pageReqVO,
-                                    HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PeopleInfoDO> list = peopleInfoService.getUserInfoPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "人员信息-个人档案.xls", "数据", PeopleInfoRespVO.class,
-                BeanUtils.toBean(list, PeopleInfoRespVO.class));
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/PeopleSkillController.java

@@ -1,96 +0,0 @@
-package com.citu.module.menduner.system.controller.admin.people;
-
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillRespVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillSaveReqVO;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.citu.framework.common.pojo.PageParam;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.common.util.object.BeanUtils;
-import static com.citu.framework.common.pojo.CommonResult.success;
-
-import com.citu.framework.excel.core.util.ExcelUtils;
-
-import com.citu.framework.apilog.core.annotation.ApiAccessLog;
-import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleSkillDO;
-import com.citu.module.menduner.system.service.people.PeopleSkillService;
-
-@Tag(name = "管理后台 - 人员技能")
-@RestController
-@RequestMapping("/menduner/system/people-skill")
-@Validated
-public class PeopleSkillController {
-
-    @Resource
-    private PeopleSkillService peopleSkillService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建人员技能")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-skill:create')")
-    public CommonResult<Long> createUserSkill(@Valid @RequestBody PeopleSkillSaveReqVO createReqVO) {
-        return success(peopleSkillService.createUserSkill(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新人员技能")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-skill:update')")
-    public CommonResult<Boolean> updateUserSkill(@Valid @RequestBody PeopleSkillSaveReqVO updateReqVO) {
-        peopleSkillService.updateUserSkill(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除人员技能")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-skill:delete')")
-    public CommonResult<Boolean> deleteUserSkill(@RequestParam("id") Long id) {
-        peopleSkillService.deleteUserSkill(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得人员技能")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-skill:query')")
-    public CommonResult<PeopleSkillRespVO> getUserSkill(@RequestParam("id") Long id) {
-        PeopleSkillDO userSkill = peopleSkillService.getUserSkill(id);
-        return success(BeanUtils.toBean(userSkill, PeopleSkillRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得人员技能分页")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-skill:query')")
-    public CommonResult<PageResult<PeopleSkillRespVO>> getUserSkillPage(@Valid PeopleSkillPageReqVO pageReqVO) {
-        PageResult<PeopleSkillDO> pageResult = peopleSkillService.getUserSkillPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PeopleSkillRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出人员技能 Excel")
-    @PreAuthorize("@ss.hasPermission('menduner:system:people-skill:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportUserSkillExcel(@Valid PeopleSkillPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<PeopleSkillDO> list = peopleSkillService.getUserSkillPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "人员技能.xls", "数据", PeopleSkillRespVO.class,
-                        BeanUtils.toBean(list, PeopleSkillRespVO.class));
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/PersonCertificateController.java

@@ -0,0 +1,96 @@
+package com.citu.module.menduner.system.controller.admin.person;
+
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificatePageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificateRespVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificateSaveReqVO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.citu.framework.common.pojo.PageParam;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+import com.citu.framework.excel.core.util.ExcelUtils;
+
+import com.citu.framework.apilog.core.annotation.ApiAccessLog;
+import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.citu.module.menduner.system.dal.dataobject.person.PersonCertificateDO;
+import com.citu.module.menduner.system.service.person.PersonCertificateService;
+
+@Tag(name = "管理后台 - 人才证书")
+@RestController
+@RequestMapping("/menduner/system/person-certificate")
+@Validated
+public class PersonCertificateController {
+
+    @Resource
+    private PersonCertificateService personCertificateService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建人才证书")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-certificate:create')")
+    public CommonResult<Long> createUserCertificate(@Valid @RequestBody PersonCertificateSaveReqVO createReqVO) {
+        return success(personCertificateService.createUserCertificate(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新人才证书")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-certificate:update')")
+    public CommonResult<Boolean> updateUserCertificate(@Valid @RequestBody PersonCertificateSaveReqVO updateReqVO) {
+        personCertificateService.updateUserCertificate(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除人才证书")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-certificate:delete')")
+    public CommonResult<Boolean> deleteUserCertificate(@RequestParam("id") Long id) {
+        personCertificateService.deleteUserCertificate(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得人才证书")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-certificate:query')")
+    public CommonResult<PersonCertificateRespVO> getUserCertificate(@RequestParam("id") Long id) {
+        PersonCertificateDO userCertificate = personCertificateService.getUserCertificate(id);
+        return success(BeanUtils.toBean(userCertificate, PersonCertificateRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得人才证书分页")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-certificate:query')")
+    public CommonResult<PageResult<PersonCertificateRespVO>> getUserCertificatePage(@Valid PersonCertificatePageReqVO pageReqVO) {
+        PageResult<PersonCertificateDO> pageResult = personCertificateService.getUserCertificatePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PersonCertificateRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出人才证书 Excel")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-certificate:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportUserCertificateExcel(@Valid PersonCertificatePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<PersonCertificateDO> list = personCertificateService.getUserCertificatePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "人才证书.xls", "数据", PersonCertificateRespVO.class,
+                        BeanUtils.toBean(list, PersonCertificateRespVO.class));
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/PersonInfoController.java

@@ -0,0 +1,93 @@
+package com.citu.module.menduner.system.controller.admin.person;
+
+import com.citu.framework.apilog.core.annotation.ApiAccessLog;
+import com.citu.framework.common.pojo.CommonResult;
+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.dal.dataobject.person.PersonInfoDO;
+import com.citu.module.menduner.system.service.person.PersonInfoService;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoRespVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoSaveReqVO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 人才信息-个人档案")
+@RestController
+@RequestMapping("/menduner/system/person-info")
+@Validated
+public class PersonInfoController {
+
+    @Resource
+    private PersonInfoService personInfoService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建人才信息-个人档案")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-info:create')")
+    public CommonResult<Long> createUserInfo(@Valid @RequestBody PersonInfoSaveReqVO createReqVO) {
+        return success(personInfoService.createUserInfo(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新人才信息-个人档案")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-info:update')")
+    public CommonResult<Boolean> updateUserInfo(@Valid @RequestBody PersonInfoSaveReqVO updateReqVO) {
+        personInfoService.updateUserInfo(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除人才信息-个人档案")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-info:delete')")
+    public CommonResult<Boolean> deleteUserInfo(@RequestParam("id") Long id) {
+        personInfoService.deleteUserInfo(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得人才信息-个人档案")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-info:query')")
+    public CommonResult<PersonInfoRespVO> getUserInfo(@RequestParam("id") Long id) {
+        PersonInfoDO userInfo = personInfoService.getUserInfo(id);
+        return success(BeanUtils.toBean(userInfo, PersonInfoRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得人才信息-个人档案分页")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-info:query')")
+    public CommonResult<PageResult<PersonInfoRespVO>> getUserInfoPage(@Valid PersonInfoPageReqVO pageReqVO) {
+        PageResult<PersonInfoDO> pageResult = personInfoService.getUserInfoPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PersonInfoRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出人才信息-个人档案 Excel")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-info:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportUserInfoExcel(@Valid PersonInfoPageReqVO pageReqVO,
+                                    HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<PersonInfoDO> list = personInfoService.getUserInfoPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "人才信息-个人档案.xls", "数据", PersonInfoRespVO.class,
+                BeanUtils.toBean(list, PersonInfoRespVO.class));
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/PersonSkillController.java

@@ -0,0 +1,96 @@
+package com.citu.module.menduner.system.controller.admin.person;
+
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillRespVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillSaveReqVO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.citu.framework.common.pojo.PageParam;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+import com.citu.framework.excel.core.util.ExcelUtils;
+
+import com.citu.framework.apilog.core.annotation.ApiAccessLog;
+import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
+import com.citu.module.menduner.system.service.person.PersonSkillService;
+
+@Tag(name = "管理后台 - 人才技能")
+@RestController
+@RequestMapping("/menduner/system/person-skill")
+@Validated
+public class PersonSkillController {
+
+    @Resource
+    private PersonSkillService personSkillService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建人才技能")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-skill:create')")
+    public CommonResult<Long> createUserSkill(@Valid @RequestBody PersonSkillSaveReqVO createReqVO) {
+        return success(personSkillService.createUserSkill(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新人才技能")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-skill:update')")
+    public CommonResult<Boolean> updateUserSkill(@Valid @RequestBody PersonSkillSaveReqVO updateReqVO) {
+        personSkillService.updateUserSkill(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除人才技能")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-skill:delete')")
+    public CommonResult<Boolean> deleteUserSkill(@RequestParam("id") Long id) {
+        personSkillService.deleteUserSkill(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得人才技能")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-skill:query')")
+    public CommonResult<PersonSkillRespVO> getUserSkill(@RequestParam("id") Long id) {
+        PersonSkillDO userSkill = personSkillService.getUserSkill(id);
+        return success(BeanUtils.toBean(userSkill, PersonSkillRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得人才技能分页")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-skill:query')")
+    public CommonResult<PageResult<PersonSkillRespVO>> getUserSkillPage(@Valid PersonSkillPageReqVO pageReqVO) {
+        PageResult<PersonSkillDO> pageResult = personSkillService.getUserSkillPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PersonSkillRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出人才技能 Excel")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-skill:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportUserSkillExcel(@Valid PersonSkillPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<PersonSkillDO> list = personSkillService.getUserSkillPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "人才技能.xls", "数据", PersonSkillRespVO.class,
+                        BeanUtils.toBean(list, PersonSkillRespVO.class));
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleCertificatePageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonCertificatePageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -8,11 +8,11 @@ import java.time.LocalDateTime;
 
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 人员证书分页 Request VO")
+@Schema(description = "管理后台 - 人才证书分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class PeopleCertificatePageReqVO extends PageParam {
+public class PersonCertificatePageReqVO extends PageParam {
 
     @Schema(description = "用户id", example = "16810")
     private Long userId;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleCertificateRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonCertificateRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -6,10 +6,10 @@ import lombok.*;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
-@Schema(description = "管理后台 - 人员证书 Response VO")
+@Schema(description = "管理后台 - 人才证书 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PeopleCertificateRespVO {
+public class PersonCertificateRespVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25497")
     @ExcelProperty("id")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleCertificateSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonCertificateSaveReqVO.java

@@ -1,13 +1,13 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import javax.validation.constraints.*;
 
-@Schema(description = "管理后台 - 人员证书新增/修改 Request VO")
+@Schema(description = "管理后台 - 人才证书新增/修改 Request VO")
 @Data
-public class PeopleCertificateSaveReqVO {
+public class PersonCertificateSaveReqVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25497")
     private Long id;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleInfoPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonInfoPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -11,11 +11,11 @@ import java.time.LocalDateTime;
 
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 人员信息-个人档案分页 Request VO")
+@Schema(description = "管理后台 - 人才信息-个人档案分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class PeopleInfoPageReqVO extends PageParam {
+public class PersonInfoPageReqVO extends PageParam {
 
     @Schema(description = "用户id", example = "18804")
     private Long userId;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleInfoRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonInfoRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -7,10 +7,10 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 人员信息-个人档案 Response VO")
+@Schema(description = "管理后台 - 人才信息-个人档案 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PeopleInfoRespVO {
+public class PersonInfoRespVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25036")
     @ExcelProperty("id")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleInfoSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonInfoSaveReqVO.java

@@ -1,13 +1,13 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 人员信息-个人档案新增/修改 Request VO")
+@Schema(description = "管理后台 - 人才信息-个人档案新增/修改 Request VO")
 @Data
-public class PeopleInfoSaveReqVO {
+public class PersonInfoSaveReqVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25036")
     private Long id;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleSkillPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonSkillPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -8,11 +8,11 @@ import java.time.LocalDateTime;
 
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 人员技能分页 Request VO")
+@Schema(description = "管理后台 - 人才技能分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class PeopleSkillPageReqVO extends PageParam {
+public class PersonSkillPageReqVO extends PageParam {
 
     @Schema(description = "用户id", example = "7946")
     private Long userId;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleSkillRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonSkillRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -10,10 +10,10 @@ import com.citu.framework.excel.core.convert.DictConvert;
 
 import static com.citu.module.menduner.system.enums.DictTypeConstants.MENDUNER_SKILL_LEVEL;
 
-@Schema(description = "管理后台 - 人员技能 Response VO")
+@Schema(description = "管理后台 - 人才技能 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PeopleSkillRespVO {
+public class PersonSkillRespVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24591")
     @ExcelProperty("id")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/people/vo/PeopleSkillSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/vo/PersonSkillSaveReqVO.java

@@ -1,13 +1,13 @@
-package com.citu.module.menduner.system.controller.admin.people.vo;
+package com.citu.module.menduner.system.controller.admin.person.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import javax.validation.constraints.*;
 
-@Schema(description = "管理后台 - 人员技能新增/修改 Request VO")
+@Schema(description = "管理后台 - 人才技能新增/修改 Request VO")
 @Data
-public class PeopleSkillSaveReqVO {
+public class PersonSkillSaveReqVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24591")
     private Long id;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/contact/AppEnterpriseUserContactRespVO.java

@@ -10,25 +10,25 @@ public class AppEnterpriseUserContactRespVO {
     @Schema(description = "所属企业id", example = "9907")
     private Long enterpriseId;
 
-    @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9592")
+    @Schema(description = "用户id", example = "9592")
     private Long userId;
 
-    @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://123.jpg")
+    @Schema(description = "头像", example = "http://123.jpg")
     private String avatar;
 
-    @Schema(description = "联系人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "9592")
+    @Schema(description = "联系人名称", example = "9592")
     private String name;
 
-    @Schema(description = "状态,是否在线", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+    @Schema(description = "状态,是否在线", example = "0")
     private Integer status;
 
-    @Schema(description = "岗位中文名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "人事")
+    @Schema(description = "岗位中文名称", example = "人事")
     private String postNameCn;
 
-    @Schema(description = "岗位英文名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "human resources")
+    @Schema(description = "岗位英文名称", example = "human resources")
     private String postNameEn;
 
-    @Schema(description = "岗位编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "HR")
+    @Schema(description = "岗位编码", example = "HR")
     private String postCode;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseSimpleRespVO.java

@@ -9,28 +9,28 @@ import java.util.List;
 @Schema(description = "menduner - 首页-企业简易 Response VO")
 public class AppEnterpriseSimpleRespVO {
 
-    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "123")
+    @Schema(description = "企业id", example = "123")
     private Long id;
 
-    @Schema(description = "企业全称", requiredMode = Schema.RequiredMode.REQUIRED, example = "xx科技有限公司")
+    @Schema(description = "企业全称", example = "xx科技有限公司")
     private String name;
 
-    @Schema(description = "企业别称", requiredMode = Schema.RequiredMode.REQUIRED, example = "xx科技")
+    @Schema(description = "企业别称", example = "xx科技")
     private String anotherName;
 
-    @Schema(description = "所在行业", requiredMode = Schema.RequiredMode.REQUIRED, example = "123")
+    @Schema(description = "所在行业", example = "123")
     private Long industryId;
 
-    @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）", example = "1")
     private Integer scale;
 
-    @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", example = "1")
     private Integer financingStatus;
 
-    @Schema(description = "企业logo地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.menduner.com/static/img/loginlogo2.7924c12.png")
+    @Schema(description = "企业logo地址", example = "https://www.menduner.com/static/img/loginlogo2.7924c12.png")
     private String logoUrl;
 
-    @Schema(description = "公司福利", requiredMode = Schema.RequiredMode.REQUIRED, example = "[]")
+    @Schema(description = "公司福利", example = "[]")
     private List<String> welfareList;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustryChildrenRespVO.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class AppIndustryChildrenRespVO {
 
 
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7293")
+    @Schema(description = "id", example = "7293")
     private Long id;
 
     @Schema(description = "行业中文名称")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustrySimpleRespVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 public class AppIndustrySimpleRespVO {
 
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7293")
+    @Schema(description = "id", example = "7293")
     private Long id;
 
     @Schema(description = "行业中文名称")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/AppJobAdvertisedController.java

@@ -72,7 +72,7 @@ public class AppJobAdvertisedController {
     }
 
     @GetMapping("/get/search")
-    @Operation(summary = "根据条件搜索职位")
+    @Operation(summary = "根据条件搜索招聘职位")
     public CommonResult<PageResult<AppJobAdvertisedSearchRespVO>> getAcquaintedJobAdvertised(@Valid AppJobAdvertisedSearchPageReqVO pageReqVO) {
         PageResult<AppJobAdvertisedSearchRespVO> respVO = jobAdvertisedService.getAcquaintedJobAdvertised(pageReqVO);
         return success(respVO);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppEnterpriseJobHomeRespVO.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Builder
 public class AppEnterpriseJobHomeRespVO extends AppEnterpriseSimpleRespVO {
 
-    @Schema(description = "企业发布职位", requiredMode = Schema.RequiredMode.REQUIRED, example = "{}")
+    @Schema(description = "企业发布职位", example = "{}")
     private List<AppJobAdvertisedSimpleRespVO> jobList;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedDetailRespVO.java

@@ -18,32 +18,32 @@ import static com.citu.module.menduner.system.enums.DictTypeConstants.MENDUNER_S
 @Data
 public class AppJobAdvertisedDetailRespVO {
 
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "4770")
+    @Schema(description = "id", example = "4770")
     private Long id;
 
-    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29465")
+    @Schema(description = "企业id", example = "29465")
     private Long enterpriseId;
 
-    @Schema(description = "发布用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9592")
+    @Schema(description = "发布用户id", example = "9592")
     private Long userId;
 
-    @Schema(description = "工作地区", requiredMode = Schema.RequiredMode.REQUIRED, example = "25976")
+    @Schema(description = "工作地区", example = "25976")
     private Long areaId;
 
-    @Schema(description = "职位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "职位名称", example = "张三")
     private String name;
 
-    @Schema(description = "职位类型id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31707")
+    @Schema(description = "职位类型id", example = "31707")
     private Long positionId;
 
-    @Schema(description = "招聘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "招聘类型", example = "2")
     @DictFormat(MENDUNER_JOB_TYPE)
     private Integer type;
 
-    @Schema(description = "工作经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "工作经验", example = "1")
     private Integer expType;
 
-    @Schema(description = "学历要求", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "学历要求", example = "1")
     private Integer eduType;
 
     @Schema(description = "薪酬from")
@@ -77,10 +77,10 @@ public class AppJobAdvertisedDetailRespVO {
     @DictFormat(MENDUNER_STATUS)
     private Integer status;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "更新时间")
     private LocalDateTime updateTime;
 
     @Schema(description = "企业信息")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedRespVO.java

@@ -8,19 +8,19 @@ import lombok.Data;
 public class AppJobAdvertisedRespVO extends AppJobAdvertisedSimpleRespVO {
 
 
-    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "123")
+    @Schema(description = "企业id", example = "123")
     private Long enterpriseId;
 
-    @Schema(description = "企业别称", requiredMode = Schema.RequiredMode.REQUIRED, example = "xx科技")
+    @Schema(description = "企业别称", example = "xx科技")
     private String anotherName;
 
-    @Schema(description = "所在行业", requiredMode = Schema.RequiredMode.REQUIRED, example = "123")
+    @Schema(description = "所在行业", example = "123")
     private Long industryId;
 
-    @Schema(description = "人员规模(menduner_scale)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "人员规模(menduner_scale)", example = "1")
     private Integer scale;
 
-    @Schema(description = "企业logo地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.menduner.com/static/img/loginlogo2.7924c12.png")
+    @Schema(description = "企业logo地址", example = "https://www.menduner.com/static/img/loginlogo2.7924c12.png")
     private String logoUrl;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSearchPageReqVO.java

@@ -23,13 +23,13 @@ public class AppJobAdvertisedSearchPageReqVO extends PageParam {
     @Schema(description = "工作地区id集合", example = "[]")
     private List<Long> areaIds;
 
-    @Schema(description = "工作经验(menduner_exp_type)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "工作经验(menduner_exp_type)",  example = "1")
     private Integer expType;
 
-    @Schema(description = "学历要求(menduner_education_type)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "学历要求(menduner_education_type)", example = "1")
     private Integer eduType;
 
-    @Schema(description = "薪酬待遇范围(menduner_pay_scope)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12")
+    @Schema(description = "薪酬待遇范围(menduner_pay_scope)",  example = "12")
     private Integer payType;
 
     @Schema(description = "求职类型(menduner_job_type)", example = "2")
@@ -47,10 +47,10 @@ public class AppJobAdvertisedSearchPageReqVO extends PageParam {
     @Schema(description = "行业信息id集合", example = "[]")
     private List<Long> industryIds;
 
-    @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）", example = "1")
     private Integer scale;
 
-    @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）",  example = "1")
     private Integer financingStatus;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSimpleRespVO.java

@@ -10,33 +10,33 @@ import java.util.List;
 @Data
 public class AppJobAdvertisedSimpleRespVO {
 
-    @Schema(description = "职位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "123")
+    @Schema(description = "职位id", example = "123")
     private Long id;
 
-    @Schema(description = "招聘职位标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "项目经理")
+    @Schema(description = "招聘职位标题", example = "项目经理")
     private String name;
 
-    @Schema(description = "职位类型id", requiredMode = Schema.RequiredMode.REQUIRED, example = "123")
+    @Schema(description = "职位类型id", example = "123")
     private Long positionId;
 
-    @Schema(description = "薪酬from", requiredMode = Schema.RequiredMode.REQUIRED, example = "6")
+    @Schema(description = "薪酬from", example = "6")
     private BigDecimal payFrom;
 
-    @Schema(description = "薪酬to", requiredMode = Schema.RequiredMode.REQUIRED, example = "12")
+    @Schema(description = "薪酬to", example = "12")
     private BigDecimal payTo;
 
-    @Schema(description = "薪酬单位(menduner_pay_unit)", requiredMode = Schema.RequiredMode.REQUIRED, example = "月/年")
+    @Schema(description = "薪酬单位(menduner_pay_unit)", example = "月/年")
     private Integer payUnit;
 
-    @Schema(description = "工作地区id", requiredMode = Schema.RequiredMode.REQUIRED, example = "110000")
+    @Schema(description = "工作地区id", example = "110000")
     private Long areaId;
 
-    @Schema(description = "工作经验(menduner_exp_type)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "工作经验(menduner_exp_type)", example = "1")
     private Integer expType;
 
-    @Schema(description = "学历要求(menduner_education_type)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "学历要求(menduner_education_type)", example = "1")
     private Integer eduType;
 
-    @Schema(description = "职位标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "[xx,xx]")
+    @Schema(description = "职位标签", example = "[xx,xx]")
     private List<String> tagList;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/position/vo/AppPositionChildrenRespVO.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class AppPositionChildrenRespVO {
 
 
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27892")
+    @Schema(description = "id", example = "27892")
     private Long id;
 
     @Schema(description = "职位中文名称")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/position/vo/AppPositionSimpleRespVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 public class AppPositionSimpleRespVO {
 
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27892")
+    @Schema(description = "id", example = "27892")
     private Long id;
 
     private String nameCn;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/post/AppEnterprisePostRespVO.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 @Schema(description = "menduner - 企业岗位简易信息 Response VO")
 public class AppEnterprisePostRespVO {
 
-    @Schema(description = "岗位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13815")
+    @Schema(description = "岗位ID", example = "13815")
     private Long id;
 
     @Schema(description = "所属企业id", example = "9907")
@@ -18,21 +18,21 @@ public class AppEnterprisePostRespVO {
     @Schema(description = "岗位缩写")
     private String code;
 
-    @Schema(description = "岗位中文名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "岗位中文名称")
     private String nameCn;
 
-    @Schema(description = "岗位英文", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "岗位英文")
     private String nameEn;
 
-    @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "显示顺序")
     private Integer sort;
 
-    @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "状态（0正常 1停用）", example = "2")
     private Integer status;
 
     @Schema(description = "备注", example = "随便")
     private String remark;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     private LocalDateTime createTime;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserRespVO.java

@@ -17,11 +17,11 @@ import static com.citu.module.menduner.system.enums.DictTypeConstants.MENDUNER_S
 @ExcelIgnoreUnannotated
 public class AppMdeUserRespVO {
 
-    @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2684")
+    @Schema(description = "用户ID", example = "2684")
     @ExcelProperty("用户ID")
     private Long id;
 
-    @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @Schema(description = "用户账号", example = "李四")
     @ExcelProperty("用户账号")
     private String username;
 
@@ -37,7 +37,7 @@ public class AppMdeUserRespVO {
     @ExcelProperty("头像地址")
     private String avatar;
 
-    @Schema(description = "帐号状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "帐号状态（0正常 1停用）", example = "2")
     @ExcelProperty(value = "帐号状态（0正常 1停用）", converter = DictConvert.class)
     @DictFormat(MENDUNER_STATUS)
     private Integer status;
@@ -58,7 +58,7 @@ public class AppMdeUserRespVO {
     @ExcelProperty("最后登录时间")
     private LocalDateTime loginDate;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/people/PeopleCertificateDO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonCertificateDO.java

@@ -1,23 +1,23 @@
-package com.citu.module.menduner.system.dal.dataobject.people;
+package com.citu.module.menduner.system.dal.dataobject.person;
 
 import lombok.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
- * 人员证书 DO
+ * 人才证书 DO
  *
  * @author Rayson
  */
-@TableName("mde_people_certificate")
-@KeySequence("mde_people_certificate_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("mde_person_certificate")
+@KeySequence("mde_person_certificate_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PeopleCertificateDO extends BaseDO {
+public class PersonCertificateDO extends BaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/people/PeopleInfoDO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonInfoDO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.dal.dataobject.people;
+package com.citu.module.menduner.system.dal.dataobject.person;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,19 +9,19 @@ import lombok.*;
 import java.time.LocalDateTime;
 
 /**
- * 人员信息-个人档案 DO
+ * 人才信息-个人档案 DO
  *
  * @author Rayson
  */
-@TableName("mde_people_info")
-@KeySequence("mde_people_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("mde_person_info")
+@KeySequence("mde_person_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PeopleInfoDO extends BaseDO {
+public class PersonInfoDO extends BaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/people/PeopleSkillDO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonSkillDO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.dal.dataobject.people;
+package com.citu.module.menduner.system.dal.dataobject.person;
 
 import com.citu.module.menduner.system.enums.userskill.SkillLevelEnum;
 import lombok.*;
@@ -6,19 +6,19 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
- * 人员技能 DO
+ * 人才技能 DO
  *
  * @author Rayson
  */
-@TableName("mde_people_skill")
-@KeySequence("mde_people_skill_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("mde_person_skill")
+@KeySequence("mde_person_skill_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PeopleSkillDO extends BaseDO {
+public class PersonSkillDO extends BaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/people/PeopleCertificateMapper.java

@@ -1,26 +0,0 @@
-package com.citu.module.menduner.system.dal.mysql.people;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.citu.framework.mybatis.core.mapper.BaseMapperX;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificatePageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleCertificateDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 人员证书 Mapper
- *
- * @author Rayson
- */
-@Mapper
-public interface PeopleCertificateMapper extends BaseMapperX<PeopleCertificateDO> {
-
-    default PageResult<PeopleCertificateDO> selectPage(PeopleCertificatePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<PeopleCertificateDO>()
-                .eqIfPresent(PeopleCertificateDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(PeopleCertificateDO::getCertificateId, reqVO.getCertificateId())
-                .betweenIfPresent(PeopleCertificateDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(PeopleCertificateDO::getId));
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/people/PeopleInfoMapper.java

@@ -1,36 +0,0 @@
-package com.citu.module.menduner.system.dal.mysql.people;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.citu.framework.mybatis.core.mapper.BaseMapperX;
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleInfoDO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoPageReqVO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 人员信息-个人档案 Mapper
- *
- * @author Rayson
- */
-@Mapper
-public interface PeopleInfoMapper extends BaseMapperX<PeopleInfoDO> {
-
-    default PageResult<PeopleInfoDO> selectPage(PeopleInfoPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<PeopleInfoDO>()
-                .eqIfPresent(PeopleInfoDO::getUserId, reqVO.getUserId())
-                .likeRightIfPresent(PeopleInfoDO::getName, reqVO.getName())
-                .eqIfPresent(PeopleInfoDO::getSex, reqVO.getSex())
-                .eqIfPresent(PeopleInfoDO::getAvatar, reqVO.getAvatar())
-                .likeRightIfPresent(PeopleInfoDO::getPhone, reqVO.getPhone())
-                .likeRightIfPresent(PeopleInfoDO::getEmail, reqVO.getEmail())
-                .eqIfPresent(PeopleInfoDO::getWxCode, reqVO.getWxCode())
-                .eqIfPresent(PeopleInfoDO::getBirthday, reqVO.getBirthday())
-                .eqIfPresent(PeopleInfoDO::getMaritalStatus, reqVO.getMaritalStatus())
-                .eqIfPresent(PeopleInfoDO::getAreaId, reqVO.getAreaId())
-                .eqIfPresent(PeopleInfoDO::getJobType, reqVO.getJobType())
-                .eqIfPresent(PeopleInfoDO::getJobStatus, reqVO.getJobStatus())
-                .betweenIfPresent(PeopleInfoDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(PeopleInfoDO::getId));
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/people/PeopleSkillMapper.java

@@ -1,27 +0,0 @@
-package com.citu.module.menduner.system.dal.mysql.people;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.citu.framework.mybatis.core.mapper.BaseMapperX;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleSkillDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 人员技能 Mapper
- *
- * @author Rayson
- */
-@Mapper
-public interface PeopleSkillMapper extends BaseMapperX<PeopleSkillDO> {
-
-    default PageResult<PeopleSkillDO> selectPage(PeopleSkillPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<PeopleSkillDO>()
-                .eqIfPresent(PeopleSkillDO::getUserId, reqVO.getUserId())
-                .likeRightIfPresent(PeopleSkillDO::getName, reqVO.getName())
-                .eqIfPresent(PeopleSkillDO::getLevel, reqVO.getLevel())
-                .betweenIfPresent(PeopleSkillDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(PeopleSkillDO::getId));
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonCertificateMapper.java

@@ -0,0 +1,26 @@
+package com.citu.module.menduner.system.dal.mysql.person;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificatePageReqVO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonCertificateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 人才证书 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface PersonCertificateMapper extends BaseMapperX<PersonCertificateDO> {
+
+    default PageResult<PersonCertificateDO> selectPage(PersonCertificatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PersonCertificateDO>()
+                .eqIfPresent(PersonCertificateDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(PersonCertificateDO::getCertificateId, reqVO.getCertificateId())
+                .betweenIfPresent(PersonCertificateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(PersonCertificateDO::getId));
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonInfoMapper.java

@@ -0,0 +1,36 @@
+package com.citu.module.menduner.system.dal.mysql.person;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoPageReqVO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 人才信息-个人档案 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
+
+    default PageResult<PersonInfoDO> selectPage(PersonInfoPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PersonInfoDO>()
+                .eqIfPresent(PersonInfoDO::getUserId, reqVO.getUserId())
+                .likeRightIfPresent(PersonInfoDO::getName, reqVO.getName())
+                .eqIfPresent(PersonInfoDO::getSex, reqVO.getSex())
+                .eqIfPresent(PersonInfoDO::getAvatar, reqVO.getAvatar())
+                .likeRightIfPresent(PersonInfoDO::getPhone, reqVO.getPhone())
+                .likeRightIfPresent(PersonInfoDO::getEmail, reqVO.getEmail())
+                .eqIfPresent(PersonInfoDO::getWxCode, reqVO.getWxCode())
+                .eqIfPresent(PersonInfoDO::getBirthday, reqVO.getBirthday())
+                .eqIfPresent(PersonInfoDO::getMaritalStatus, reqVO.getMaritalStatus())
+                .eqIfPresent(PersonInfoDO::getAreaId, reqVO.getAreaId())
+                .eqIfPresent(PersonInfoDO::getJobType, reqVO.getJobType())
+                .eqIfPresent(PersonInfoDO::getJobStatus, reqVO.getJobStatus())
+                .betweenIfPresent(PersonInfoDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(PersonInfoDO::getId));
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonSkillMapper.java

@@ -0,0 +1,27 @@
+package com.citu.module.menduner.system.dal.mysql.person;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillPageReqVO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 人才技能 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface PersonSkillMapper extends BaseMapperX<PersonSkillDO> {
+
+    default PageResult<PersonSkillDO> selectPage(PersonSkillPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PersonSkillDO>()
+                .eqIfPresent(PersonSkillDO::getUserId, reqVO.getUserId())
+                .likeRightIfPresent(PersonSkillDO::getName, reqVO.getName())
+                .eqIfPresent(PersonSkillDO::getLevel, reqVO.getLevel())
+                .betweenIfPresent(PersonSkillDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(PersonSkillDO::getId));
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -451,7 +451,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         List<AppJobAdvertisedSearchRespVO> list =new ArrayList<>();
         AppJobAdvertisedSearchRespVO respVO =new AppJobAdvertisedSearchRespVO();
 
-        AppJobAdvertisedSimpleRespVO job=new AppJobAdvertisedRespVO();
+        AppJobAdvertisedSimpleRespVO job=new AppJobAdvertisedSimpleRespVO();
         job.setId(1L);
         job.setAreaId(110000L);
         job.setPositionId(1L);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleCertificateService.java

@@ -1,55 +0,0 @@
-package com.citu.module.menduner.system.service.people;
-
-import javax.validation.*;
-
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificatePageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificateSaveReqVO;
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleCertificateDO;
-import com.citu.framework.common.pojo.PageResult;
-
-/**
- * 人员证书 Service 接口
- *
- * @author Rayson
- */
-public interface PeopleCertificateService {
-
-    /**
-     * 创建人员证书
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createUserCertificate(@Valid PeopleCertificateSaveReqVO createReqVO);
-
-    /**
-     * 更新人员证书
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateUserCertificate(@Valid PeopleCertificateSaveReqVO updateReqVO);
-
-    /**
-     * 删除人员证书
-     *
-     * @param id 编号
-     */
-    void deleteUserCertificate(Long id);
-
-    /**
-     * 获得人员证书
-     *
-     * @param id 编号
-     * @return 人员证书
-     */
-    PeopleCertificateDO getUserCertificate(Long id);
-
-    /**
-     * 获得人员证书分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 人员证书分页
-     */
-    PageResult<PeopleCertificateDO> getUserCertificatePage(PeopleCertificatePageReqVO pageReqVO);
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleCertificateServiceImpl.java

@@ -1,72 +0,0 @@
-package com.citu.module.menduner.system.service.people;
-
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificatePageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificateSaveReqVO;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleCertificateDO;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.util.object.BeanUtils;
-
-import com.citu.module.menduner.system.dal.mysql.people.PeopleCertificateMapper;
-
-import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_CERTIFICATE_NOT_EXISTS;
-
-/**
- * 人员证书 Service 实现类
- *
- * @author Rayson
- */
-@Service
-@Validated
-public class PeopleCertificateServiceImpl implements PeopleCertificateService {
-
-    @Resource
-    private PeopleCertificateMapper peopleCertificateMapper;
-
-    @Override
-    public Long createUserCertificate(PeopleCertificateSaveReqVO createReqVO) {
-        // 插入
-        PeopleCertificateDO userCertificate = BeanUtils.toBean(createReqVO, PeopleCertificateDO.class);
-        peopleCertificateMapper.insert(userCertificate);
-        // 返回
-        return userCertificate.getId();
-    }
-
-    @Override
-    public void updateUserCertificate(PeopleCertificateSaveReqVO updateReqVO) {
-        // 校验存在
-        validateUserCertificateExists(updateReqVO.getId());
-        // 更新
-        PeopleCertificateDO updateObj = BeanUtils.toBean(updateReqVO, PeopleCertificateDO.class);
-        peopleCertificateMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteUserCertificate(Long id) {
-        // 校验存在
-        validateUserCertificateExists(id);
-        // 删除
-        peopleCertificateMapper.deleteById(id);
-    }
-
-    private void validateUserCertificateExists(Long id) {
-        if (peopleCertificateMapper.selectById(id) == null) {
-            throw exception(MDE_USER_CERTIFICATE_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public PeopleCertificateDO getUserCertificate(Long id) {
-        return peopleCertificateMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<PeopleCertificateDO> getUserCertificatePage(PeopleCertificatePageReqVO pageReqVO) {
-        return peopleCertificateMapper.selectPage(pageReqVO);
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleInfoService.java

@@ -1,55 +0,0 @@
-package com.citu.module.menduner.system.service.people;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleInfoDO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoSaveReqVO;
-
-import javax.validation.Valid;
-
-/**
- * 人员信息-个人档案 Service 接口
- *
- * @author Rayson
- */
-public interface PeopleInfoService {
-
-    /**
-     * 创建人员信息-个人档案
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createUserInfo(@Valid PeopleInfoSaveReqVO createReqVO);
-
-    /**
-     * 更新人员信息-个人档案
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateUserInfo(@Valid PeopleInfoSaveReqVO updateReqVO);
-
-    /**
-     * 删除人员信息-个人档案
-     *
-     * @param id 编号
-     */
-    void deleteUserInfo(Long id);
-
-    /**
-     * 获得人员信息-个人档案
-     *
-     * @param id 编号
-     * @return 人员信息-个人档案
-     */
-    PeopleInfoDO getUserInfo(Long id);
-
-    /**
-     * 获得人员信息-个人档案分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 人员信息-个人档案分页
-     */
-    PageResult<PeopleInfoDO> getUserInfoPage(PeopleInfoPageReqVO pageReqVO);
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleInfoServiceImpl.java

@@ -1,71 +0,0 @@
-package com.citu.module.menduner.system.service.people;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.util.object.BeanUtils;
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleInfoDO;
-import com.citu.module.menduner.system.dal.mysql.people.PeopleInfoMapper;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoSaveReqVO;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-
-import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_INFO_NOT_EXISTS;
-
-/**
- * 人员信息-个人档案 Service 实现类
- *
- * @author Rayson
- */
-@Service
-@Validated
-public class PeopleInfoServiceImpl implements PeopleInfoService {
-
-    @Resource
-    private PeopleInfoMapper peopleInfoMapper;
-
-    @Override
-    public Long createUserInfo(PeopleInfoSaveReqVO createReqVO) {
-        // 插入
-        PeopleInfoDO userInfo = BeanUtils.toBean(createReqVO, PeopleInfoDO.class);
-        peopleInfoMapper.insert(userInfo);
-        // 返回
-        return userInfo.getId();
-    }
-
-    @Override
-    public void updateUserInfo(PeopleInfoSaveReqVO updateReqVO) {
-        // 校验存在
-        validateUserInfoExists(updateReqVO.getId());
-        // 更新
-        PeopleInfoDO updateObj = BeanUtils.toBean(updateReqVO, PeopleInfoDO.class);
-        peopleInfoMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteUserInfo(Long id) {
-        // 校验存在
-        validateUserInfoExists(id);
-        // 删除
-        peopleInfoMapper.deleteById(id);
-    }
-
-    private void validateUserInfoExists(Long id) {
-        if (peopleInfoMapper.selectById(id) == null) {
-            throw exception(MDE_USER_INFO_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public PeopleInfoDO getUserInfo(Long id) {
-        return peopleInfoMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<PeopleInfoDO> getUserInfoPage(PeopleInfoPageReqVO pageReqVO) {
-        return peopleInfoMapper.selectPage(pageReqVO);
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleSkillService.java

@@ -1,55 +0,0 @@
-package com.citu.module.menduner.system.service.people;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillSaveReqVO;
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleSkillDO;
-
-import javax.validation.Valid;
-
-/**
- * 人员技能 Service 接口
- *
- * @author Rayson
- */
-public interface PeopleSkillService {
-
-    /**
-     * 创建人员技能
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createUserSkill(@Valid PeopleSkillSaveReqVO createReqVO);
-
-    /**
-     * 更新人员技能
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateUserSkill(@Valid PeopleSkillSaveReqVO updateReqVO);
-
-    /**
-     * 删除人员技能
-     *
-     * @param id 编号
-     */
-    void deleteUserSkill(Long id);
-
-    /**
-     * 获得人员技能
-     *
-     * @param id 编号
-     * @return 人员技能
-     */
-    PeopleSkillDO getUserSkill(Long id);
-
-    /**
-     * 获得人员技能分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 人员技能分页
-     */
-    PageResult<PeopleSkillDO> getUserSkillPage(PeopleSkillPageReqVO pageReqVO);
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleSkillServiceImpl.java

@@ -1,72 +0,0 @@
-package com.citu.module.menduner.system.service.people;
-
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillSaveReqVO;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleSkillDO;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.util.object.BeanUtils;
-
-import com.citu.module.menduner.system.dal.mysql.people.PeopleSkillMapper;
-
-import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_SKILL_NOT_EXISTS;
-
-/**
- * 人员技能 Service 实现类
- *
- * @author Rayson
- */
-@Service
-@Validated
-public class PeopleSkillServiceImpl implements PeopleSkillService {
-
-    @Resource
-    private PeopleSkillMapper peopleSkillMapper;
-
-    @Override
-    public Long createUserSkill(PeopleSkillSaveReqVO createReqVO) {
-        // 插入
-        PeopleSkillDO userSkill = BeanUtils.toBean(createReqVO, PeopleSkillDO.class);
-        peopleSkillMapper.insert(userSkill);
-        // 返回
-        return userSkill.getId();
-    }
-
-    @Override
-    public void updateUserSkill(PeopleSkillSaveReqVO updateReqVO) {
-        // 校验存在
-        validateUserSkillExists(updateReqVO.getId());
-        // 更新
-        PeopleSkillDO updateObj = BeanUtils.toBean(updateReqVO, PeopleSkillDO.class);
-        peopleSkillMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteUserSkill(Long id) {
-        // 校验存在
-        validateUserSkillExists(id);
-        // 删除
-        peopleSkillMapper.deleteById(id);
-    }
-
-    private void validateUserSkillExists(Long id) {
-        if (peopleSkillMapper.selectById(id) == null) {
-            throw exception(MDE_USER_SKILL_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public PeopleSkillDO getUserSkill(Long id) {
-        return peopleSkillMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<PeopleSkillDO> getUserSkillPage(PeopleSkillPageReqVO pageReqVO) {
-        return peopleSkillMapper.selectPage(pageReqVO);
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonCertificateService.java

@@ -0,0 +1,55 @@
+package com.citu.module.menduner.system.service.person;
+
+import javax.validation.*;
+
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificatePageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificateSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonCertificateDO;
+import com.citu.framework.common.pojo.PageResult;
+
+/**
+ * 人才证书 Service 接口
+ *
+ * @author Rayson
+ */
+public interface PersonCertificateService {
+
+    /**
+     * 创建人才证书
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createUserCertificate(@Valid PersonCertificateSaveReqVO createReqVO);
+
+    /**
+     * 更新人才证书
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateUserCertificate(@Valid PersonCertificateSaveReqVO updateReqVO);
+
+    /**
+     * 删除人才证书
+     *
+     * @param id 编号
+     */
+    void deleteUserCertificate(Long id);
+
+    /**
+     * 获得人才证书
+     *
+     * @param id 编号
+     * @return 人才证书
+     */
+    PersonCertificateDO getUserCertificate(Long id);
+
+    /**
+     * 获得人才证书分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 人才证书分页
+     */
+    PageResult<PersonCertificateDO> getUserCertificatePage(PersonCertificatePageReqVO pageReqVO);
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonCertificateServiceImpl.java

@@ -0,0 +1,72 @@
+package com.citu.module.menduner.system.service.person;
+
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificatePageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificateSaveReqVO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import com.citu.module.menduner.system.dal.dataobject.person.PersonCertificateDO;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
+
+import com.citu.module.menduner.system.dal.mysql.person.PersonCertificateMapper;
+
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_CERTIFICATE_NOT_EXISTS;
+
+/**
+ * 人才证书 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Validated
+public class PersonCertificateServiceImpl implements PersonCertificateService {
+
+    @Resource
+    private PersonCertificateMapper personCertificateMapper;
+
+    @Override
+    public Long createUserCertificate(PersonCertificateSaveReqVO createReqVO) {
+        // 插入
+        PersonCertificateDO userCertificate = BeanUtils.toBean(createReqVO, PersonCertificateDO.class);
+        personCertificateMapper.insert(userCertificate);
+        // 返回
+        return userCertificate.getId();
+    }
+
+    @Override
+    public void updateUserCertificate(PersonCertificateSaveReqVO updateReqVO) {
+        // 校验存在
+        validateUserCertificateExists(updateReqVO.getId());
+        // 更新
+        PersonCertificateDO updateObj = BeanUtils.toBean(updateReqVO, PersonCertificateDO.class);
+        personCertificateMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteUserCertificate(Long id) {
+        // 校验存在
+        validateUserCertificateExists(id);
+        // 删除
+        personCertificateMapper.deleteById(id);
+    }
+
+    private void validateUserCertificateExists(Long id) {
+        if (personCertificateMapper.selectById(id) == null) {
+            throw exception(MDE_USER_CERTIFICATE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public PersonCertificateDO getUserCertificate(Long id) {
+        return personCertificateMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<PersonCertificateDO> getUserCertificatePage(PersonCertificatePageReqVO pageReqVO) {
+        return personCertificateMapper.selectPage(pageReqVO);
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonInfoService.java

@@ -0,0 +1,55 @@
+package com.citu.module.menduner.system.service.person;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoSaveReqVO;
+
+import javax.validation.Valid;
+
+/**
+ * 人才信息-个人档案 Service 接口
+ *
+ * @author Rayson
+ */
+public interface PersonInfoService {
+
+    /**
+     * 创建人才信息-个人档案
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createUserInfo(@Valid PersonInfoSaveReqVO createReqVO);
+
+    /**
+     * 更新人才信息-个人档案
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateUserInfo(@Valid PersonInfoSaveReqVO updateReqVO);
+
+    /**
+     * 删除人才信息-个人档案
+     *
+     * @param id 编号
+     */
+    void deleteUserInfo(Long id);
+
+    /**
+     * 获得人才信息-个人档案
+     *
+     * @param id 编号
+     * @return 人才信息-个人档案
+     */
+    PersonInfoDO getUserInfo(Long id);
+
+    /**
+     * 获得人才信息-个人档案分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 人才信息-个人档案分页
+     */
+    PageResult<PersonInfoDO> getUserInfoPage(PersonInfoPageReqVO pageReqVO);
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonInfoServiceImpl.java

@@ -0,0 +1,71 @@
+package com.citu.module.menduner.system.service.person;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
+import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoSaveReqVO;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_INFO_NOT_EXISTS;
+
+/**
+ * 人才信息-个人档案 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Validated
+public class PersonInfoServiceImpl implements PersonInfoService {
+
+    @Resource
+    private PersonInfoMapper personInfoMapper;
+
+    @Override
+    public Long createUserInfo(PersonInfoSaveReqVO createReqVO) {
+        // 插入
+        PersonInfoDO userInfo = BeanUtils.toBean(createReqVO, PersonInfoDO.class);
+        personInfoMapper.insert(userInfo);
+        // 返回
+        return userInfo.getId();
+    }
+
+    @Override
+    public void updateUserInfo(PersonInfoSaveReqVO updateReqVO) {
+        // 校验存在
+        validateUserInfoExists(updateReqVO.getId());
+        // 更新
+        PersonInfoDO updateObj = BeanUtils.toBean(updateReqVO, PersonInfoDO.class);
+        personInfoMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteUserInfo(Long id) {
+        // 校验存在
+        validateUserInfoExists(id);
+        // 删除
+        personInfoMapper.deleteById(id);
+    }
+
+    private void validateUserInfoExists(Long id) {
+        if (personInfoMapper.selectById(id) == null) {
+            throw exception(MDE_USER_INFO_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public PersonInfoDO getUserInfo(Long id) {
+        return personInfoMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<PersonInfoDO> getUserInfoPage(PersonInfoPageReqVO pageReqVO) {
+        return personInfoMapper.selectPage(pageReqVO);
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonSkillService.java

@@ -0,0 +1,55 @@
+package com.citu.module.menduner.system.service.person;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
+
+import javax.validation.Valid;
+
+/**
+ * 人才技能 Service 接口
+ *
+ * @author Rayson
+ */
+public interface PersonSkillService {
+
+    /**
+     * 创建人才技能
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createUserSkill(@Valid PersonSkillSaveReqVO createReqVO);
+
+    /**
+     * 更新人才技能
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateUserSkill(@Valid PersonSkillSaveReqVO updateReqVO);
+
+    /**
+     * 删除人才技能
+     *
+     * @param id 编号
+     */
+    void deleteUserSkill(Long id);
+
+    /**
+     * 获得人才技能
+     *
+     * @param id 编号
+     * @return 人才技能
+     */
+    PersonSkillDO getUserSkill(Long id);
+
+    /**
+     * 获得人才技能分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 人才技能分页
+     */
+    PageResult<PersonSkillDO> getUserSkillPage(PersonSkillPageReqVO pageReqVO);
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonSkillServiceImpl.java

@@ -0,0 +1,72 @@
+package com.citu.module.menduner.system.service.person;
+
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillSaveReqVO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
+
+import com.citu.module.menduner.system.dal.mysql.person.PersonSkillMapper;
+
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_SKILL_NOT_EXISTS;
+
+/**
+ * 人才技能 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Validated
+public class PersonSkillServiceImpl implements PersonSkillService {
+
+    @Resource
+    private PersonSkillMapper personSkillMapper;
+
+    @Override
+    public Long createUserSkill(PersonSkillSaveReqVO createReqVO) {
+        // 插入
+        PersonSkillDO userSkill = BeanUtils.toBean(createReqVO, PersonSkillDO.class);
+        personSkillMapper.insert(userSkill);
+        // 返回
+        return userSkill.getId();
+    }
+
+    @Override
+    public void updateUserSkill(PersonSkillSaveReqVO updateReqVO) {
+        // 校验存在
+        validateUserSkillExists(updateReqVO.getId());
+        // 更新
+        PersonSkillDO updateObj = BeanUtils.toBean(updateReqVO, PersonSkillDO.class);
+        personSkillMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteUserSkill(Long id) {
+        // 校验存在
+        validateUserSkillExists(id);
+        // 删除
+        personSkillMapper.deleteById(id);
+    }
+
+    private void validateUserSkillExists(Long id) {
+        if (personSkillMapper.selectById(id) == null) {
+            throw exception(MDE_USER_SKILL_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public PersonSkillDO getUserSkill(Long id) {
+        return personSkillMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<PersonSkillDO> getUserSkillPage(PersonSkillPageReqVO pageReqVO) {
+        return personSkillMapper.selectPage(pageReqVO);
+    }
+
+}

menduner/menduner-system-biz/src/main/resources/mapper/usercertificate/PeopleCertificateMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.citu.module.menduner.system.dal.mysql.people.PeopleCertificateMapper">
+<mapper namespace="com.citu.module.menduner.system.dal.mysql.person.PersonCertificateMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

menduner/menduner-system-biz/src/main/resources/mapper/userinfo/PeopleInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.citu.module.menduner.system.dal.mysql.people.PeopleInfoMapper">
+<mapper namespace="com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

menduner/menduner-system-biz/src/main/resources/mapper/userskill/PeopleSkillMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.citu.module.menduner.system.dal.mysql.people.PeopleSkillMapper">
+<mapper namespace="com.citu.module.menduner.system.dal.mysql.person.PersonSkillMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/job/JobInterestedServiceImplTest.java

@@ -108,8 +108,8 @@ public class JobInterestedServiceImplTest extends BaseDbUnitTest {
            o.setJobType(null);
            o.setPositionId(null);
            o.setIndustryIdList(null);
-           o.setPayMin(null);
-           o.setPayMax(null);
+           o.setPayFrom(null);
+           o.setPayTo(null);
            o.setWorkAreaId(null);
            o.setInterestedAreaIdList(null);
            o.setCreateTime(null);
@@ -124,9 +124,9 @@ public class JobInterestedServiceImplTest extends BaseDbUnitTest {
        // 测试 industryIdList 不匹配
        jobInterestedMapper.insert(cloneIgnoreId(dbJobInterested, o -> o.setIndustryIdList(null)));
        // 测试 payFrom 不匹配
-       jobInterestedMapper.insert(cloneIgnoreId(dbJobInterested, o -> o.setPayMin(null)));
+       jobInterestedMapper.insert(cloneIgnoreId(dbJobInterested, o -> o.setPayFrom(null)));
        // 测试 payTo 不匹配
-       jobInterestedMapper.insert(cloneIgnoreId(dbJobInterested, o -> o.setPayMax(null)));
+       jobInterestedMapper.insert(cloneIgnoreId(dbJobInterested, o -> o.setPayTo(null)));
        // 测试 workAreaId 不匹配
        jobInterestedMapper.insert(cloneIgnoreId(dbJobInterested, o -> o.setWorkAreaId(null)));
        // 测试 interestedAreaIdList 不匹配
@@ -139,8 +139,8 @@ public class JobInterestedServiceImplTest extends BaseDbUnitTest {
        reqVO.setJobType(null);
        reqVO.setPositionId(null);
        reqVO.setIndustryIdList(null);
-       reqVO.setPayMin(null);
-       reqVO.setPayMax(null);
+       reqVO.setPayFrom(null);
+       reqVO.setPayTo(null);
        reqVO.setWorkAreaId(null);
        reqVO.setInterestedAreaIdList(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/people/PeopleCertificateServiceImplTest.java → menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/person/PersonCertificateServiceImplTest.java

@@ -1,7 +1,7 @@
-package com.citu.module.menduner.system.service.people;
+package com.citu.module.menduner.system.service.person;
 
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificatePageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleCertificateSaveReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificatePageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonCertificateSaveReqVO;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -9,8 +9,8 @@ import javax.annotation.Resource;
 
 import com.citu.framework.test.core.ut.BaseDbUnitTest;
 
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleCertificateDO;
-import com.citu.module.menduner.system.dal.mysql.people.PeopleCertificateMapper;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonCertificateDO;
+import com.citu.module.menduner.system.dal.mysql.person.PersonCertificateMapper;
 import com.citu.framework.common.pojo.PageResult;
 
 import org.springframework.context.annotation.Import;
@@ -23,54 +23,54 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * {@link PeopleCertificateServiceImpl} 的单元测试类
+ * {@link PersonCertificateServiceImpl} 的单元测试类
  *
  * @author Rayson
  */
-@Import(PeopleCertificateServiceImpl.class)
-public class PeopleCertificateServiceImplTest extends BaseDbUnitTest {
+@Import(PersonCertificateServiceImpl.class)
+public class PersonCertificateServiceImplTest extends BaseDbUnitTest {
 
     @Resource
-    private PeopleCertificateServiceImpl userCertificateService;
+    private PersonCertificateServiceImpl userCertificateService;
 
     @Resource
-    private PeopleCertificateMapper peopleCertificateMapper;
+    private PersonCertificateMapper personCertificateMapper;
 
     @Test
     public void testCreateUserCertificate_success() {
         // 准备参数
-        PeopleCertificateSaveReqVO createReqVO = randomPojo(PeopleCertificateSaveReqVO.class).setId(null);
+        PersonCertificateSaveReqVO createReqVO = randomPojo(PersonCertificateSaveReqVO.class).setId(null);
 
         // 调用
         Long userCertificateId = userCertificateService.createUserCertificate(createReqVO);
         // 断言
         assertNotNull(userCertificateId);
         // 校验记录的属性是否正确
-        PeopleCertificateDO userCertificate = peopleCertificateMapper.selectById(userCertificateId);
+        PersonCertificateDO userCertificate = personCertificateMapper.selectById(userCertificateId);
         assertPojoEquals(createReqVO, userCertificate, "id");
     }
 
     @Test
     public void testUpdateUserCertificate_success() {
         // mock 数据
-        PeopleCertificateDO dbUserCertificate = randomPojo(PeopleCertificateDO.class);
-        peopleCertificateMapper.insert(dbUserCertificate);// @Sql: 先插入出一条存在的数据
+        PersonCertificateDO dbUserCertificate = randomPojo(PersonCertificateDO.class);
+        personCertificateMapper.insert(dbUserCertificate);// @Sql: 先插入出一条存在的数据
         // 准备参数
-        PeopleCertificateSaveReqVO updateReqVO = randomPojo(PeopleCertificateSaveReqVO.class, o -> {
+        PersonCertificateSaveReqVO updateReqVO = randomPojo(PersonCertificateSaveReqVO.class, o -> {
             o.setId(dbUserCertificate.getId()); // 设置更新的 ID
         });
 
         // 调用
         userCertificateService.updateUserCertificate(updateReqVO);
         // 校验是否更新正确
-        PeopleCertificateDO userCertificate = peopleCertificateMapper.selectById(updateReqVO.getId()); // 获取最新的
+        PersonCertificateDO userCertificate = personCertificateMapper.selectById(updateReqVO.getId()); // 获取最新的
         assertPojoEquals(updateReqVO, userCertificate);
     }
 
     @Test
     public void testUpdateUserCertificate_notExists() {
         // 准备参数
-        PeopleCertificateSaveReqVO updateReqVO = randomPojo(PeopleCertificateSaveReqVO.class);
+        PersonCertificateSaveReqVO updateReqVO = randomPojo(PersonCertificateSaveReqVO.class);
 
         // 调用, 并断言异常
         assertServiceException(() -> userCertificateService.updateUserCertificate(updateReqVO), MDE_USER_CERTIFICATE_NOT_EXISTS);
@@ -79,15 +79,15 @@ public class PeopleCertificateServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testDeleteUserCertificate_success() {
         // mock 数据
-        PeopleCertificateDO dbUserCertificate = randomPojo(PeopleCertificateDO.class);
-        peopleCertificateMapper.insert(dbUserCertificate);// @Sql: 先插入出一条存在的数据
+        PersonCertificateDO dbUserCertificate = randomPojo(PersonCertificateDO.class);
+        personCertificateMapper.insert(dbUserCertificate);// @Sql: 先插入出一条存在的数据
         // 准备参数
         Long id = dbUserCertificate.getId();
 
         // 调用
         userCertificateService.deleteUserCertificate(id);
        // 校验数据不存在了
-       assertNull(peopleCertificateMapper.selectById(id));
+       assertNull(personCertificateMapper.selectById(id));
     }
 
     @Test
@@ -103,26 +103,26 @@ public class PeopleCertificateServiceImplTest extends BaseDbUnitTest {
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetUserCertificatePage() {
        // mock 数据
-       PeopleCertificateDO dbUserCertificate = randomPojo(PeopleCertificateDO.class, o -> { // 等会查询到
+       PersonCertificateDO dbUserCertificate = randomPojo(PersonCertificateDO.class, o -> { // 等会查询到
            o.setUserId(null);
            o.setCertificateId(null);
            o.setCreateTime(null);
        });
-       peopleCertificateMapper.insert(dbUserCertificate);
+       personCertificateMapper.insert(dbUserCertificate);
        // 测试 userId 不匹配
-       peopleCertificateMapper.insert(cloneIgnoreId(dbUserCertificate, o -> o.setUserId(null)));
+       personCertificateMapper.insert(cloneIgnoreId(dbUserCertificate, o -> o.setUserId(null)));
        // 测试 certificateId 不匹配
-       peopleCertificateMapper.insert(cloneIgnoreId(dbUserCertificate, o -> o.setCertificateId(null)));
+       personCertificateMapper.insert(cloneIgnoreId(dbUserCertificate, o -> o.setCertificateId(null)));
        // 测试 createTime 不匹配
-       peopleCertificateMapper.insert(cloneIgnoreId(dbUserCertificate, o -> o.setCreateTime(null)));
+       personCertificateMapper.insert(cloneIgnoreId(dbUserCertificate, o -> o.setCreateTime(null)));
        // 准备参数
-       PeopleCertificatePageReqVO reqVO = new PeopleCertificatePageReqVO();
+       PersonCertificatePageReqVO reqVO = new PersonCertificatePageReqVO();
        reqVO.setUserId(null);
        reqVO.setCertificateId(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
        // 调用
-       PageResult<PeopleCertificateDO> pageResult = userCertificateService.getUserCertificatePage(reqVO);
+       PageResult<PersonCertificateDO> pageResult = userCertificateService.getUserCertificatePage(reqVO);
        // 断言
        assertEquals(1, pageResult.getTotal());
        assertEquals(1, pageResult.getList().size());

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/people/PeopleInfoServiceImplTest.java → menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/person/PersonInfoServiceImplTest.java

@@ -1,7 +1,7 @@
-package com.citu.module.menduner.system.service.people;
+package com.citu.module.menduner.system.service.person;
 
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleInfoSaveReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonInfoSaveReqVO;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -9,8 +9,8 @@ import javax.annotation.Resource;
 
 import com.citu.framework.test.core.ut.BaseDbUnitTest;
 
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleInfoDO;
-import com.citu.module.menduner.system.dal.mysql.people.PeopleInfoMapper;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
+import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
 import com.citu.framework.common.pojo.PageResult;
 
 import org.springframework.context.annotation.Import;
@@ -23,54 +23,54 @@ import static com.citu.framework.common.util.object.ObjectUtils.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * {@link PeopleInfoServiceImpl} 的单元测试类
+ * {@link PersonInfoServiceImpl} 的单元测试类
  *
  * @author Rayson
  */
-@Import(PeopleInfoServiceImpl.class)
-public class PeopleInfoServiceImplTest extends BaseDbUnitTest {
+@Import(PersonInfoServiceImpl.class)
+public class PersonInfoServiceImplTest extends BaseDbUnitTest {
 
     @Resource
-    private PeopleInfoServiceImpl userInfoService;
+    private PersonInfoServiceImpl userInfoService;
 
     @Resource
-    private PeopleInfoMapper peopleInfoMapper;
+    private PersonInfoMapper personInfoMapper;
 
     @Test
     public void testCreateUserInfo_success() {
         // 准备参数
-        PeopleInfoSaveReqVO createReqVO = randomPojo(PeopleInfoSaveReqVO.class).setId(null);
+        PersonInfoSaveReqVO createReqVO = randomPojo(PersonInfoSaveReqVO.class).setId(null);
 
         // 调用
         Long userInfoId = userInfoService.createUserInfo(createReqVO);
         // 断言
         assertNotNull(userInfoId);
         // 校验记录的属性是否正确
-        PeopleInfoDO userInfo = peopleInfoMapper.selectById(userInfoId);
+        PersonInfoDO userInfo = personInfoMapper.selectById(userInfoId);
         assertPojoEquals(createReqVO, userInfo, "id");
     }
 
     @Test
     public void testUpdateUserInfo_success() {
         // mock 数据
-        PeopleInfoDO dbUserInfo = randomPojo(PeopleInfoDO.class);
-        peopleInfoMapper.insert(dbUserInfo);// @Sql: 先插入出一条存在的数据
+        PersonInfoDO dbUserInfo = randomPojo(PersonInfoDO.class);
+        personInfoMapper.insert(dbUserInfo);// @Sql: 先插入出一条存在的数据
         // 准备参数
-        PeopleInfoSaveReqVO updateReqVO = randomPojo(PeopleInfoSaveReqVO.class, o -> {
+        PersonInfoSaveReqVO updateReqVO = randomPojo(PersonInfoSaveReqVO.class, o -> {
             o.setId(dbUserInfo.getId()); // 设置更新的 ID
         });
 
         // 调用
         userInfoService.updateUserInfo(updateReqVO);
         // 校验是否更新正确
-        PeopleInfoDO userInfo = peopleInfoMapper.selectById(updateReqVO.getId()); // 获取最新的
+        PersonInfoDO userInfo = personInfoMapper.selectById(updateReqVO.getId()); // 获取最新的
         assertPojoEquals(updateReqVO, userInfo);
     }
 
     @Test
     public void testUpdateUserInfo_notExists() {
         // 准备参数
-        PeopleInfoSaveReqVO updateReqVO = randomPojo(PeopleInfoSaveReqVO.class);
+        PersonInfoSaveReqVO updateReqVO = randomPojo(PersonInfoSaveReqVO.class);
 
         // 调用, 并断言异常
         assertServiceException(() -> userInfoService.updateUserInfo(updateReqVO), MDE_USER_INFO_NOT_EXISTS);
@@ -79,15 +79,15 @@ public class PeopleInfoServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testDeleteUserInfo_success() {
         // mock 数据
-        PeopleInfoDO dbUserInfo = randomPojo(PeopleInfoDO.class);
-        peopleInfoMapper.insert(dbUserInfo);// @Sql: 先插入出一条存在的数据
+        PersonInfoDO dbUserInfo = randomPojo(PersonInfoDO.class);
+        personInfoMapper.insert(dbUserInfo);// @Sql: 先插入出一条存在的数据
         // 准备参数
         Long id = dbUserInfo.getId();
 
         // 调用
         userInfoService.deleteUserInfo(id);
        // 校验数据不存在了
-       assertNull(peopleInfoMapper.selectById(id));
+       assertNull(personInfoMapper.selectById(id));
     }
 
     @Test
@@ -103,7 +103,7 @@ public class PeopleInfoServiceImplTest extends BaseDbUnitTest {
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetUserInfoPage() {
        // mock 数据
-       PeopleInfoDO dbUserInfo = randomPojo(PeopleInfoDO.class, o -> { // 等会查询到
+       PersonInfoDO dbUserInfo = randomPojo(PersonInfoDO.class, o -> { // 等会查询到
            o.setUserId(null);
            o.setName(null);
            o.setSex(null);
@@ -118,35 +118,35 @@ public class PeopleInfoServiceImplTest extends BaseDbUnitTest {
            o.setJobStatus(null);
            o.setCreateTime(null);
        });
-       peopleInfoMapper.insert(dbUserInfo);
+       personInfoMapper.insert(dbUserInfo);
        // 测试 userId 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setUserId(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setUserId(null)));
        // 测试 name 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setName(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setName(null)));
        // 测试 sex 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setSex(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setSex(null)));
        // 测试 avatar 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setAvatar(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setAvatar(null)));
        // 测试 phone 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setPhone(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setPhone(null)));
        // 测试 email 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setEmail(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setEmail(null)));
        // 测试 wxCode 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setWxCode(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setWxCode(null)));
        // 测试 birthday 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setBirthday(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setBirthday(null)));
        // 测试 maritalStatus 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setMaritalStatus(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setMaritalStatus(null)));
        // 测试 areaId 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setAreaId(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setAreaId(null)));
        // 测试 jobType 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setJobType(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setJobType(null)));
        // 测试 jobStatus 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setJobStatus(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setJobStatus(null)));
        // 测试 createTime 不匹配
-       peopleInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setCreateTime(null)));
+       personInfoMapper.insert(cloneIgnoreId(dbUserInfo, o -> o.setCreateTime(null)));
        // 准备参数
-       PeopleInfoPageReqVO reqVO = new PeopleInfoPageReqVO();
+       PersonInfoPageReqVO reqVO = new PersonInfoPageReqVO();
        reqVO.setUserId(null);
        reqVO.setName(null);
        reqVO.setSex(null);
@@ -162,7 +162,7 @@ public class PeopleInfoServiceImplTest extends BaseDbUnitTest {
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
        // 调用
-       PageResult<PeopleInfoDO> pageResult = userInfoService.getUserInfoPage(reqVO);
+       PageResult<PersonInfoDO> pageResult = userInfoService.getUserInfoPage(reqVO);
        // 断言
        assertEquals(1, pageResult.getTotal());
        assertEquals(1, pageResult.getList().size());

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/people/PeopleSkillServiceImplTest.java → menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/person/PersonSkillServiceImplTest.java

@@ -1,7 +1,7 @@
-package com.citu.module.menduner.system.service.people;
+package com.citu.module.menduner.system.service.person;
 
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillPageReqVO;
-import com.citu.module.menduner.system.controller.admin.people.vo.PeopleSkillSaveReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillPageReqVO;
+import com.citu.module.menduner.system.controller.admin.person.vo.PersonSkillSaveReqVO;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -9,8 +9,8 @@ import javax.annotation.Resource;
 
 import com.citu.framework.test.core.ut.BaseDbUnitTest;
 
-import com.citu.module.menduner.system.dal.dataobject.people.PeopleSkillDO;
-import com.citu.module.menduner.system.dal.mysql.people.PeopleSkillMapper;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
+import com.citu.module.menduner.system.dal.mysql.person.PersonSkillMapper;
 import com.citu.framework.common.pojo.PageResult;
 
 import org.springframework.context.annotation.Import;
@@ -23,54 +23,54 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * {@link PeopleSkillServiceImpl} 的单元测试类
+ * {@link PersonSkillServiceImpl} 的单元测试类
  *
  * @author Rayson
  */
-@Import(PeopleSkillServiceImpl.class)
-public class PeopleSkillServiceImplTest extends BaseDbUnitTest {
+@Import(PersonSkillServiceImpl.class)
+public class PersonSkillServiceImplTest extends BaseDbUnitTest {
 
     @Resource
-    private PeopleSkillServiceImpl userSkillService;
+    private PersonSkillServiceImpl userSkillService;
 
     @Resource
-    private PeopleSkillMapper peopleSkillMapper;
+    private PersonSkillMapper personSkillMapper;
 
     @Test
     public void testCreateUserSkill_success() {
         // 准备参数
-        PeopleSkillSaveReqVO createReqVO = randomPojo(PeopleSkillSaveReqVO.class).setId(null);
+        PersonSkillSaveReqVO createReqVO = randomPojo(PersonSkillSaveReqVO.class).setId(null);
 
         // 调用
         Long userSkillId = userSkillService.createUserSkill(createReqVO);
         // 断言
         assertNotNull(userSkillId);
         // 校验记录的属性是否正确
-        PeopleSkillDO userSkill = peopleSkillMapper.selectById(userSkillId);
+        PersonSkillDO userSkill = personSkillMapper.selectById(userSkillId);
         assertPojoEquals(createReqVO, userSkill, "id");
     }
 
     @Test
     public void testUpdateUserSkill_success() {
         // mock 数据
-        PeopleSkillDO dbUserSkill = randomPojo(PeopleSkillDO.class);
-        peopleSkillMapper.insert(dbUserSkill);// @Sql: 先插入出一条存在的数据
+        PersonSkillDO dbUserSkill = randomPojo(PersonSkillDO.class);
+        personSkillMapper.insert(dbUserSkill);// @Sql: 先插入出一条存在的数据
         // 准备参数
-        PeopleSkillSaveReqVO updateReqVO = randomPojo(PeopleSkillSaveReqVO.class, o -> {
+        PersonSkillSaveReqVO updateReqVO = randomPojo(PersonSkillSaveReqVO.class, o -> {
             o.setId(dbUserSkill.getId()); // 设置更新的 ID
         });
 
         // 调用
         userSkillService.updateUserSkill(updateReqVO);
         // 校验是否更新正确
-        PeopleSkillDO userSkill = peopleSkillMapper.selectById(updateReqVO.getId()); // 获取最新的
+        PersonSkillDO userSkill = personSkillMapper.selectById(updateReqVO.getId()); // 获取最新的
         assertPojoEquals(updateReqVO, userSkill);
     }
 
     @Test
     public void testUpdateUserSkill_notExists() {
         // 准备参数
-        PeopleSkillSaveReqVO updateReqVO = randomPojo(PeopleSkillSaveReqVO.class);
+        PersonSkillSaveReqVO updateReqVO = randomPojo(PersonSkillSaveReqVO.class);
 
         // 调用, 并断言异常
         assertServiceException(() -> userSkillService.updateUserSkill(updateReqVO), MDE_USER_SKILL_NOT_EXISTS);
@@ -79,15 +79,15 @@ public class PeopleSkillServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testDeleteUserSkill_success() {
         // mock 数据
-        PeopleSkillDO dbUserSkill = randomPojo(PeopleSkillDO.class);
-        peopleSkillMapper.insert(dbUserSkill);// @Sql: 先插入出一条存在的数据
+        PersonSkillDO dbUserSkill = randomPojo(PersonSkillDO.class);
+        personSkillMapper.insert(dbUserSkill);// @Sql: 先插入出一条存在的数据
         // 准备参数
         Long id = dbUserSkill.getId();
 
         // 调用
         userSkillService.deleteUserSkill(id);
        // 校验数据不存在了
-       assertNull(peopleSkillMapper.selectById(id));
+       assertNull(personSkillMapper.selectById(id));
     }
 
     @Test
@@ -103,30 +103,30 @@ public class PeopleSkillServiceImplTest extends BaseDbUnitTest {
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetUserSkillPage() {
        // mock 数据
-       PeopleSkillDO dbUserSkill = randomPojo(PeopleSkillDO.class, o -> { // 等会查询到
+       PersonSkillDO dbUserSkill = randomPojo(PersonSkillDO.class, o -> { // 等会查询到
            o.setUserId(null);
            o.setName(null);
            o.setLevel(null);
            o.setCreateTime(null);
        });
-       peopleSkillMapper.insert(dbUserSkill);
+       personSkillMapper.insert(dbUserSkill);
        // 测试 userId 不匹配
-       peopleSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setUserId(null)));
+       personSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setUserId(null)));
        // 测试 name 不匹配
-       peopleSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setName(null)));
+       personSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setName(null)));
        // 测试 level 不匹配
-       peopleSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setLevel(null)));
+       personSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setLevel(null)));
        // 测试 createTime 不匹配
-       peopleSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setCreateTime(null)));
+       personSkillMapper.insert(cloneIgnoreId(dbUserSkill, o -> o.setCreateTime(null)));
        // 准备参数
-       PeopleSkillPageReqVO reqVO = new PeopleSkillPageReqVO();
+       PersonSkillPageReqVO reqVO = new PersonSkillPageReqVO();
        reqVO.setUserId(null);
        reqVO.setName(null);
        reqVO.setLevel(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
        // 调用
-       PageResult<PeopleSkillDO> pageResult = userSkillService.getUserSkillPage(reqVO);
+       PageResult<PersonSkillDO> pageResult = userSkillService.getUserSkillPage(reqVO);
        // 断言
        assertEquals(1, pageResult.getTotal());
        assertEquals(1, pageResult.getList().size());

menduner/menduner-system-biz/src/test/resources/sql/create_tables.sql

@@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS "mde_area" (
                                                    "deleted" bit NOT NULL DEFAULT FALSE,
                                                    "tenant_id" bigint NOT NULL DEFAULT 0,
                                                    PRIMARY KEY ("id")
-   ) COMMENT '人员技能表';
+   ) COMMENT '人才技能表';
   
    CREATE TABLE IF NOT EXISTS "mde_work_exp" (
                                                  "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
@@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS "mde_area" (
                                                          "deleted" bit NOT NULL DEFAULT FALSE,
                                                          "tenant_id" bigint NOT NULL DEFAULT 0,
                                                          PRIMARY KEY ("id")
-   ) COMMENT '人员证书表';
+   ) COMMENT '人才证书表';
   
    CREATE TABLE IF NOT EXISTS "mde_school" (
                                                "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,