1、增加行业、职位的排序

2、增加人才信息户籍地

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonInfoSaveReqVO.java

@@ -44,6 +44,9 @@ public class AppPersonInfoSaveReqVO {
     @Schema(description = "所在城市", example = "8366")
     private Long areaId;
 
+    @Schema(description = "户籍地", example = "8366")
+    private Long regId;
+
     @Schema(description = "求职类型（0全职 1兼职 2临时 3实习）", example = "1")
     private String jobType;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/industry/IndustryRespVO.java

@@ -37,6 +37,10 @@ public class IndustryRespVO {
     @ExcelProperty("层级")
     private Integer level;
 
+    @Schema(description = "显示顺序", example = "1")
+    @ExcelProperty("显示顺序")
+    private Integer sort;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/industry/IndustrySaveReqVO.java

@@ -27,4 +27,7 @@ public class IndustrySaveReqVO {
     @Schema(description = "层级")
     private Integer level;
 
+    @Schema(description = "显示顺序", example = "1")
+    private Integer sort;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoPageReqVO.java

@@ -49,6 +49,9 @@ public class PersonInfoPageReqVO extends PageParam {
     @Schema(description = "现居住地", example = "8366")
     private Long areaId;
 
+    @Schema(description = "户籍地", example = "8366")
+    private Long regId;
+
     @Schema(description = "求职类型（0全职 1兼职 2临时 3实习）", example = "1")
     private String jobType;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoRespVO.java

@@ -56,6 +56,10 @@ public class PersonInfoRespVO {
     @ExcelProperty("现居住地")
     private Long areaId;
 
+    @Schema(description = "户籍地", example = "8366")
+    @ExcelProperty("户籍地")
+    private Long regId;
+
     @Schema(description = "求职类型（0全职 1兼职 2临时 3实习）", example = "1")
     @ExcelProperty("求职类型（0全职 1兼职 2临时 3实习）")
     private String jobType;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoSaveReqVO.java

@@ -46,6 +46,9 @@ public class PersonInfoSaveReqVO {
     @Schema(description = "现居住地", example = "8366")
     private Long areaId;
 
+    @Schema(description = "户籍地", example = "8366")
+    private Long regId;
+
     @Schema(description = "求职类型（0全职 1兼职 2临时 3实习）", example = "1")
     private String jobType;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/position/PositionRespVO.java

@@ -39,6 +39,10 @@ public class PositionRespVO {
     @ExcelProperty("默认职位描述内容")
     private String content;
 
+    @Schema(description = "显示顺序", example = "1")
+    @ExcelProperty("显示顺序")
+    private Integer sort;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/position/PositionSaveReqVO.java

@@ -28,4 +28,7 @@ public class PositionSaveReqVO {
     @Schema(description = "默认职位描述内容")
     private String content;
 
+    @Schema(description = "显示顺序", example = "1")
+    private Integer sort;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/industry/IndustryDO.java

@@ -42,5 +42,8 @@ public class IndustryDO extends TenantBaseDO {
      * 层级
      **/
     private Integer level;
-
+    /**
+     * 显示顺序
+     */
+    private Integer sort;
 }

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

@@ -1,8 +1,6 @@
 package com.citu.module.menduner.system.dal.dataobject.person;
 
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
@@ -47,14 +45,17 @@ public class PersonInfoDO extends TenantBaseDO {
     /**
      * 联系手机号
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String phone;
     /**
      * 用户邮箱
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String email;
     /**
      * 微信号
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String wxCode;
     /**
      * 出生日期
@@ -67,7 +68,13 @@ public class PersonInfoDO extends TenantBaseDO {
     /**
      * 现居住地
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Long areaId;
+    /**
+     * 户籍地
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private Long regId;
     /**
      * 求职类型（0全职 1兼职 2临时 3实习）
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/position/PositionDO.java

@@ -50,5 +50,9 @@ public class PositionDO extends TenantBaseDO {
      * 默认职位描述内容
      */
     private String content;
+    /**
+     * 显示顺序
+     */
+    private Integer sort;
 
 }

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

@@ -27,7 +27,8 @@ public interface IndustryMapper extends BaseMapperX<IndustryDO> {
                 .likeRightIfPresent(IndustryDO::getNameCn, reqVO.getNameCn())
                 .likeRightIfPresent(IndustryDO::getNameEn, reqVO.getNameEn())
                 .betweenIfPresent(IndustryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(IndustryDO::getUpdateTime));
+                .orderByAsc(IndustryDO::getSort, IndustryDO::getUpdateTime)
+        );
     }
 
     default List<IndustryDO> selectList(IndustryListReqVO reqVO) {
@@ -35,7 +36,8 @@ public interface IndustryMapper extends BaseMapperX<IndustryDO> {
                 .likeRightIfPresent(IndustryDO::getNameCn, reqVO.getNameCn())
                 .likeRightIfPresent(IndustryDO::getNameEn, reqVO.getNameEn())
                 .betweenIfPresent(IndustryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(IndustryDO::getUpdateTime));
+                .orderByAsc(IndustryDO::getSort, IndustryDO::getUpdateTime)
+        );
     }
 
     default List<IndustryDO> selectList(AppIndustryListReqVO reqVO) {
@@ -43,7 +45,8 @@ public interface IndustryMapper extends BaseMapperX<IndustryDO> {
                 .likeRightIfPresent(IndustryDO::getNameCn, reqVO.getNameCn())
                 .likeRightIfPresent(IndustryDO::getNameEn, reqVO.getNameEn())
                 .betweenIfPresent(IndustryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(IndustryDO::getUpdateTime));
+                .orderByAsc(IndustryDO::getSort, IndustryDO::getUpdateTime)
+        );
     }
 
     default List<IndustryDO> selectListByParentId(Collection<Long> parentIds) {

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

@@ -3,9 +3,9 @@ package com.citu.module.menduner.system.dal.mysql.position;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.app.jobhunt.position.vo.AppPositionListReqVO;
 import com.citu.module.menduner.system.controller.base.position.PositionListReqVO;
 import com.citu.module.menduner.system.controller.base.position.PositionPageReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.position.vo.AppPositionListReqVO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
@@ -29,7 +29,8 @@ public interface PositionMapper extends BaseMapperX<PositionDO> {
                 .eqIfPresent(PositionDO::getParentId, reqVO.getParentId())
                 .eqIfPresent(PositionDO::getLevel, reqVO.getLevel())
                 .betweenIfPresent(PositionDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(PositionDO::getId));
+                .orderByAsc(PositionDO::getSort, PositionDO::getUpdateTime)
+        );
     }
 
     default List<PositionDO> selectList(PositionListReqVO reqVO) {
@@ -39,7 +40,8 @@ public interface PositionMapper extends BaseMapperX<PositionDO> {
                 .eqIfPresent(PositionDO::getParentId, reqVO.getParentId())
                 .eqIfPresent(PositionDO::getLevel, reqVO.getLevel())
                 .betweenIfPresent(PositionDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(PositionDO::getId));
+                .orderByAsc(PositionDO::getSort, PositionDO::getUpdateTime)
+        );
     }
 
     default List<PositionDO> selectList(AppPositionListReqVO reqVO) {
@@ -49,7 +51,8 @@ public interface PositionMapper extends BaseMapperX<PositionDO> {
                 .eqIfPresent(PositionDO::getParentId, reqVO.getParentId())
                 .eqIfPresent(PositionDO::getLevel, reqVO.getLevel())
                 .betweenIfPresent(PositionDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(PositionDO::getId));
+                .orderByAsc(PositionDO::getSort, PositionDO::getUpdateTime)
+        );
     }
 
     default List<PositionDO> selectListByParentId(Collection<Long> parentIds) {
@@ -68,6 +71,7 @@ public interface PositionMapper extends BaseMapperX<PositionDO> {
 
     /**
      * 根据层级随机获取十条数据
+     *
      * @param level
      * @return List<PositionDO>
      **/