1、增加积分相关模块

citu-framework/citu-common/src/main/java/com/citu/framework/common/exception/enums/ServiceErrorCodeRange.java

@@ -43,4 +43,8 @@ public class ServiceErrorCodeRange {
 
     // 模块 crm 错误码区间 [1-020-000-000 ~ 1-021-000-000)
 
+    // 模块 menduner-system [1_100_000_000 ~ 1_300_000_000]
+
+    // 模块 menduner-reward [1_400_000_000 ~ 1_300_000_000]
+
 }

menduner/menduner-reward-api/src/main/java/com/citu/module/menduner/reward/enums/ApiConstants.java

@@ -0,0 +1,23 @@
+package com.citu.module.menduner.reward.enums;
+
+import com.citu.framework.common.enums.RpcConstants;
+
+/**
+ * API 相关的枚举
+ *
+ * @author Rayson
+ */
+public class ApiConstants {
+
+    /**
+     * 服务名
+     *
+     * 注意，需要保证和 spring.application.name 保持一致
+     */
+    public static final String NAME = "menduner-reward-server";
+
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX +  "/menduner/reward";
+
+    public static final String VERSION = "1.0.0";
+
+}

menduner/menduner-reward-api/src/main/java/com/citu/module/menduner/reward/enums/ErrorCodeConstants.java

@@ -0,0 +1,18 @@
+package com.citu.module.menduner.reward.enums;
+
+import com.citu.framework.common.exception.enums.GlobalErrorCodeConstants;
+import com.citu.framework.common.exception.enums.ServiceErrorCodeRange;
+
+/**
+ * 门墩儿 积分 错误码枚举类
+ * 错误码增减原则 规范
+ * 1、每个模块都有单独的错误码；
+ * 2、假设招聘职位模块要效验企业id，则在”招聘职位模块"下新增"企业id不能为空"错误码，不允许引用"企业模块"的"id不能为空"；
+ * 3、列外，所有模块都可以引用 {公共 1_099_000_000} or {@link GlobalErrorCodeConstants} 的错误码，除此之外不可引用不同业务块的错误码；
+ * 参见 {@link ServiceErrorCodeRange}
+ *
+ * @author Rayson
+ **/
+public interface ErrorCodeConstants {
+
+}

menduner/menduner-reward-biz/pom.xml

@@ -36,5 +36,48 @@
             <groupId>com.citu</groupId>
             <artifactId>citu-spring-boot-starter-biz-tenant</artifactId>
         </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-rpc</artifactId>
+        </dependency>
+
+        <!-- Registry 注册中心相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- Config 配置中心相关 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 监控相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-monitor</artifactId>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-excel</artifactId>
+        </dependency>
     </dependencies>
 </project>

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/Test.java

@@ -0,0 +1,9 @@
+package com.citu.module.menduner.reward.controller;
+
+/**
+ * @author rayson
+ * @description Test
+ * @create 2024/6/17 下午6:53
+ **/
+public class Test {
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/admin/Test.java

@@ -0,0 +1,9 @@
+package com.citu.module.menduner.reward.controller.admin;
+
+/**
+ * @author rayson
+ * @description Test
+ * @create 2024/6/17 下午6:57
+ **/
+public class Test {
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/admin/pointruleconfig/PointRuleConfigController.java

@@ -0,0 +1,9 @@
+package com.citu.module.menduner.reward.controller.admin.pointruleconfig;
+
+/**
+ * @author rayson
+ * @description PointRuleConfigController
+ * @create 2024/6/17 下午6:53
+ **/
+public class PointRuleConfigController {
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/admin/pointruleconfig/vo/PointRuleConfigPageReqVO.java

@@ -0,0 +1,39 @@
+package com.citu.module.menduner.reward.controller.admin.pointruleconfig.vo;
+
+import com.citu.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 积分规则配置分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PointRuleConfigPageReqVO extends PageParam {
+
+    @Schema(description = "url", example = "https://www.iocoder.cn")
+    private String url;
+
+    @Schema(description = "url类型", example = "2")
+    private String type;
+
+    @Schema(description = "规则标题")
+    private String title;
+
+    @Schema(description = "数学运算符")
+    private String operation;
+
+    @Schema(description = "状态", example = "2")
+    private String status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/admin/pointruleconfig/vo/PointRuleConfigRespVO.java

@@ -0,0 +1,58 @@
+package com.citu.module.menduner.reward.controller.admin.pointruleconfig.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 积分规则配置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PointRuleConfigRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24227")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "url", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
+    @ExcelProperty("url")
+    private String url;
+
+    @Schema(description = "url类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("url类型")
+    private String type;
+
+    @Schema(description = "规则标题", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("规则标题")
+    private String title;
+
+    @Schema(description = "数学运算符", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("数学运算符")
+    private String operation;
+
+    @Schema(description = "积分数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("积分数")
+    private BigDecimal point;
+
+    @Schema(description = "触发规则", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("触发规则")
+    private String trggerRule;
+
+    @Schema(description = "约束规则")
+    @ExcelProperty("约束规则")
+    private String constraintRule;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("状态")
+    private String status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/admin/pointruleconfig/vo/PointRuleConfigSaveReqVO.java

@@ -0,0 +1,48 @@
+package com.citu.module.menduner.reward.controller.admin.pointruleconfig.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 积分规则配置新增/修改 Request VO")
+@Data
+public class PointRuleConfigSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24227")
+    private Long id;
+
+    @Schema(description = "url", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
+    @NotEmpty(message = "url不能为空")
+    private String url;
+
+    @Schema(description = "url类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "url类型不能为空")
+    private String type;
+
+    @Schema(description = "规则标题", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "规则标题不能为空")
+    private String title;
+
+    @Schema(description = "数学运算符", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "数学运算符不能为空")
+    private String operation;
+
+    @Schema(description = "积分数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "积分数不能为空")
+    private BigDecimal point;
+
+    @Schema(description = "触发规则", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "触发规则不能为空")
+    private String trggerRule;
+
+    @Schema(description = "约束规则")
+    private String constraintRule;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "状态不能为空")
+    private String status;
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/dataobject/PointRuleConfig.java

@@ -1,18 +0,0 @@
-package com.citu.module.menduner.reward.dal.dataobject;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * 积分规则配置
- **/
-@Data
-@AllArgsConstructor
-public class PointRuleConfig {
-
-    private Long id;
-    private String url;
-    private String triggerRuleJson;
-    private String limitRuleJson;
-    private Long point;
-}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/dataobject/Test.java

@@ -0,0 +1,9 @@
+package com.citu.module.menduner.reward.dal.dataobject;
+
+/**
+ * @author rayson
+ * @description Test
+ * @create 2024/6/17 下午6:56
+ **/
+public class Test {
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/dataobject/pointruleconfig/PointRuleConfigDO.java

@@ -0,0 +1,64 @@
+package com.citu.module.menduner.reward.dal.dataobject.pointruleconfig;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * 积分规则配置 DO
+ *
+ * @author Rayson
+ */
+@TableName("mde_point_rule_config")
+@KeySequence("mde_point_rule_config_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PointRuleConfigDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * url
+     */
+    private String url;
+    /**
+     * url类型
+     */
+    private String type;
+    /**
+     * 规则标题
+     */
+    private String title;
+    /**
+     * 数学运算符
+     */
+    private String operation;
+    /**
+     * 积分数
+     */
+    private BigDecimal point;
+    /**
+     * 触发规则
+     */
+    private String trggerRule;
+    /**
+     * 约束规则
+     */
+    private String constraintRule;
+    /**
+     * 状态
+     */
+    private String status;
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/mysql/Test.java

@@ -0,0 +1,9 @@
+package com.citu.module.menduner.reward.dal.mysql;
+
+/**
+ * @author rayson
+ * @description Test
+ * @create 2024/6/17 下午6:56
+ **/
+public class Test {
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/mysql/pointruleconfig/PointRuleConfigMapper.java

@@ -0,0 +1,29 @@
+package com.citu.module.menduner.reward.dal.mysql.pointruleconfig;
+
+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.reward.controller.admin.pointruleconfig.vo.PointRuleConfigPageReqVO;
+import com.citu.module.menduner.reward.dal.dataobject.pointruleconfig.PointRuleConfigDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 积分规则配置 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface PointRuleConfigMapper extends BaseMapperX<PointRuleConfigDO> {
+
+    default PageResult<PointRuleConfigDO> selectPage(PointRuleConfigPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PointRuleConfigDO>()
+                .likeIfPresent(PointRuleConfigDO::getUrl, reqVO.getUrl())
+                .eqIfPresent(PointRuleConfigDO::getType, reqVO.getType())
+                .likeIfPresent(PointRuleConfigDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(PointRuleConfigDO::getOperation, reqVO.getOperation())
+                .eqIfPresent(PointRuleConfigDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(PointRuleConfigDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(PointRuleConfigDO::getId));
+    }
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/PointRuleConfigService.java

@@ -0,0 +1,55 @@
+package com.citu.module.menduner.reward.service;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.reward.controller.admin.pointruleconfig.vo.PointRuleConfigPageReqVO;
+import com.citu.module.menduner.reward.controller.admin.pointruleconfig.vo.PointRuleConfigSaveReqVO;
+import com.citu.module.menduner.reward.dal.dataobject.pointruleconfig.PointRuleConfigDO;
+
+import javax.validation.Valid;
+
+/**
+ * 积分规则配置 Service 接口
+ *
+ * @author Rayson
+ */
+public interface PointRuleConfigService {
+
+    /**
+     * 创建积分规则配置
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createPointRuleConfig(@Valid PointRuleConfigSaveReqVO createReqVO);
+
+    /**
+     * 更新积分规则配置
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updatePointRuleConfig(@Valid PointRuleConfigSaveReqVO updateReqVO);
+
+    /**
+     * 删除积分规则配置
+     *
+     * @param id 编号
+     */
+    void deletePointRuleConfig(Long id);
+
+    /**
+     * 获得积分规则配置
+     *
+     * @param id 编号
+     * @return 积分规则配置
+     */
+    PointRuleConfigDO getPointRuleConfig(Long id);
+
+    /**
+     * 获得积分规则配置分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 积分规则配置分页
+     */
+    PageResult<PointRuleConfigDO> getPointRuleConfigPage(PointRuleConfigPageReqVO pageReqVO);
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/PointRuleConfigServiceImpl.java

@@ -0,0 +1,74 @@
+package com.citu.module.menduner.reward.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.citu.module.menduner.reward.controller.admin.pointruleconfig.vo.*;
+import com.citu.module.menduner.reward.dal.dataobject.pointruleconfig.PointRuleConfigDO;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.pojo.PageParam;
+import com.citu.framework.common.util.object.BeanUtils;
+
+import com.citu.module.menduner.reward.dal.mysql.pointruleconfig.PointRuleConfigMapper;
+
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.reward.enums.ErrorCodeConstants.*;
+
+/**
+ * 积分规则配置 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Validated
+public class PointRuleConfigServiceImpl implements PointRuleConfigService {
+
+    @Resource
+    private PointRuleConfigMapper pointRuleConfigMapper;
+
+    @Override
+    public Long createPointRuleConfig(PointRuleConfigSaveReqVO createReqVO) {
+        // 插入
+        PointRuleConfigDO pointRuleConfig = BeanUtils.toBean(createReqVO, PointRuleConfigDO.class);
+        pointRuleConfigMapper.insert(pointRuleConfig);
+        // 返回
+        return pointRuleConfig.getId();
+    }
+
+    @Override
+    public void updatePointRuleConfig(PointRuleConfigSaveReqVO updateReqVO) {
+        // 校验存在
+        validatePointRuleConfigExists(updateReqVO.getId());
+        // 更新
+        PointRuleConfigDO updateObj = BeanUtils.toBean(updateReqVO, PointRuleConfigDO.class);
+        pointRuleConfigMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deletePointRuleConfig(Long id) {
+        // 校验存在
+        validatePointRuleConfigExists(id);
+        // 删除
+        pointRuleConfigMapper.deleteById(id);
+    }
+
+    private void validatePointRuleConfigExists(Long id) {
+        if (pointRuleConfigMapper.selectById(id) == null) {
+            throw exception(POINT_RULE_CONFIG_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public PointRuleConfigDO getPointRuleConfig(Long id) {
+        return pointRuleConfigMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<PointRuleConfigDO> getPointRuleConfigPage(PointRuleConfigPageReqVO pageReqVO) {
+        return pointRuleConfigMapper.selectPage(pageReqVO);
+    }
+
+}

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -9,7 +9,7 @@ import com.citu.framework.common.exception.enums.ServiceErrorCodeRange;
  * 错误码增减原则 规范
  * 1、每个模块都有单独的错误码；
  * 2、假设招聘职位模块要效验企业id，则在”招聘职位模块"下新增"企业id不能为空"错误码，不允许引用"企业模块"的"id不能为空"；
- * 3、列外，所有模块都可以引用 {公共 1_200_000_000} or {@link GlobalErrorCodeConstants} 的错误码，除此之外不可引用不同业务块的错误码；
+ * 3、列外，所有模块都可以引用 {公共 1_099_000_000} or {@link GlobalErrorCodeConstants} 的错误码，除此之外不可引用不同业务块的错误码；
  * 参见 {@link ServiceErrorCodeRange}
  *
  * @author Rayson
@@ -17,14 +17,14 @@ import com.citu.framework.common.exception.enums.ServiceErrorCodeRange;
 public interface ErrorCodeConstants {
 
 
-    // ========== 公共 1_200_000_000 ==========
-    ErrorCode MDE_COMMON_STATUS_NOT_NULL = new ErrorCode(1_200_000_001, "状态不能为空");
-    ErrorCode MDE_COMMON_STATUS_ERROR = new ErrorCode(1_200_000_002, "修改状态必须是 {value}");
-    ErrorCode MDE_COMMON_SORT_NOT_NULL = new ErrorCode(1_200_000_003, "显示顺序不能为空");
-    ErrorCode MDE_COMMON_PARENT_ID_NOT_NULL = new ErrorCode(1_200_000_004, "上级id不能为空");
-    ErrorCode MDE_COMMON_ID_NOT_NULL = new ErrorCode(1_200_000_005, "id不能为空");
-    ErrorCode MDE_COMMON_USER_ID_NOT_NULL = new ErrorCode(1_200_000_006, "用户id不能为空");
-    ErrorCode MDE_COMMON_ENTERPRISE_ID_NOT_NULL = new ErrorCode(1_200_000_007, "企业id不能为空");
+    // ========== 公共 1_099_000_000 ==========
+    ErrorCode MDE_COMMON_STATUS_NOT_NULL = new ErrorCode(1_099_000_001, "状态不能为空");
+    ErrorCode MDE_COMMON_STATUS_ERROR = new ErrorCode(1_099_000_002, "修改状态必须是 {value}");
+    ErrorCode MDE_COMMON_SORT_NOT_NULL = new ErrorCode(1_099_000_003, "显示顺序不能为空");
+    ErrorCode MDE_COMMON_PARENT_ID_NOT_NULL = new ErrorCode(1_099_000_004, "上级id不能为空");
+    ErrorCode MDE_COMMON_ID_NOT_NULL = new ErrorCode(1_099_000_005, "id不能为空");
+    ErrorCode MDE_COMMON_USER_ID_NOT_NULL = new ErrorCode(1_099_000_006, "用户id不能为空");
+    ErrorCode MDE_COMMON_ENTERPRISE_ID_NOT_NULL = new ErrorCode(1_099_000_007, "企业id不能为空");
 
 
     // ========== 人员信息-个人档案 1_100_001_000 ==========

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

@@ -11,7 +11,7 @@ public class AppEnterpriseUserApplyReqVO {
 
 
     @Schema(description = "所属企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1420")
-    @NotNull(message = "{1_200_000_007}")
+    @NotNull(message = "{1_099_000_007}")
     private Long enterpriseId;
 
     @Schema(description = "企业岗位id", example = "25968")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/enterprise/PersonEnterpriseSubscribeReqVO.java

@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class PersonEnterpriseSubscribeReqVO {
 
-    @NotNull(message = "{1_200_000_007}")
+    @NotNull(message = "{1_099_000_007}")
     @Schema(description = "企业id", example = "19293")
     private Long enterpriseId;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/enterprise/post/AppAdminEnterprisePostSaveReqVO.java

@@ -26,11 +26,11 @@ public class AppAdminEnterprisePostSaveReqVO {
     private String nameEn;
 
     @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{1_200_000_003}")
+    @NotNull(message = "{1_099_000_003}")
     private Integer sort;
 
     @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotBlank(message = "{1_200_000_001}")
+    @NotBlank(message = "{1_099_000_001}")
     private String status;
 
     @Schema(description = "备注", example = "随便")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/person/AppAdminPersonCvController.java

@@ -60,5 +60,12 @@ public class AppAdminPersonCvController {
         return success(jobCvRelService.eliminate(StrUtils.splitToLong(ids)));
     }
 
+    @PreAuthenticated
+    @PostMapping("/entry")
+    @Operation(summary = "入职")
+    public CommonResult<Boolean> entry(@RequestParam("ids") String ids) {
+        return success(jobCvRelService.eliminate(StrUtils.splitToLong(ids)));
+    }
+
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/certificate/CertificateSaveReqVO.java

@@ -20,7 +20,7 @@ public class CertificateSaveReqVO {
     private String nameEn;
 
     @Schema(description = "上级id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19827")
-    @NotNull(message = "{1_200_000_004}")
+    @NotNull(message = "{1_099_000_004}")
     private Long parentId;
 
     @Schema(description = "层级")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserBindSaveReqVO.java

@@ -43,7 +43,7 @@ public class EnterpriseUserBindSaveReqVO {
     private String email;
 
     @Schema(description = "帐号状态（0正常 1停用 2 等待审核 3不通过）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotBlank(message = "{1_200_000_001}")
+    @NotBlank(message = "{1_099_000_001}")
     private String status;
 
     @Schema(description = "最后登录IP")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/post/EnterprisePostSaveReqVO.java

@@ -29,11 +29,11 @@ public class EnterprisePostSaveReqVO {
     private String nameEn;
 
     @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{1_200_000_003}")
+    @NotNull(message = "{1_099_000_003}")
     private Integer sort;
 
     @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotBlank(message = "{1_200_000_001}")
+    @NotBlank(message = "{1_099_000_001}")
     private String status;
 
     @Schema(description = "备注", example = "随便")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterAuditReqVO.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class EnterpriseRegisterAuditReqVO {
 
-    @NotNull(message = "{1_200_000_005}")
+    @NotNull(message = "{1_099_000_005}")
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9045")
     private Long id;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterSaveReqVO.java

@@ -32,7 +32,7 @@ public class EnterpriseRegisterSaveReqVO {
     private String businessLicenseUrl;
 
     @Schema(description = "帐号状态（0正常 1停用 2 等待审核 3不通过）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotBlank(message = "{1_200_000_001}")
+    @NotBlank(message = "{1_099_000_001}")
     private String status;
 
     @Schema(description = "审核原因", example = "不喜欢")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/user/EnterpriseUserApplyAuditReqVO.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class EnterpriseUserApplyAuditReqVO {
 
-    @NotNull(message = "{1_200_000_005}" )
+    @NotNull(message = "{1_099_000_005}" )
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9045")
     private Long id;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/user/EnterpriseUserApplySaveReqVO.java

@@ -13,7 +13,7 @@ public class EnterpriseUserApplySaveReqVO {
     private Long id;
 
     @Schema(description = "所属企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1420")
-    @NotNull(message = "{1_200_000_007}")
+    @NotNull(message = "{1_099_000_007}")
     private Long enterpriseId;
 
     @Schema(description = "企业岗位id", example = "25968")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/JobCvRelSaveReqVO.java

@@ -14,7 +14,7 @@ public class JobCvRelSaveReqVO {
     private Long id;
 
     @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20026")
-    @NotNull(message = "{1_200_000_007}")
+    @NotNull(message = "{1_099_000_007}")
     private Long enterpriseId;
 
     @Schema(description = "发布的职位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19402")
@@ -22,11 +22,11 @@ public class JobCvRelSaveReqVO {
     private Long jobId;
 
     @Schema(description = "发布职位的用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6227")
-    @NotNull(message = "{1_200_000_006}")
+    @NotNull(message = "{1_099_000_006}")
     private Long publishUserId;
 
     @Schema(description = "投递用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7769")
-    @NotNull(message = "{1_200_000_006}")
+    @NotNull(message = "{1_099_000_006}")
     private Long userId;
 
     @Schema(description = "简历附件标题", requiredMode = Schema.RequiredMode.REQUIRED)

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/major/MajorSaveReqVO.java

@@ -19,7 +19,7 @@ public class MajorSaveReqVO {
     private String nameEn;
 
     @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotBlank(message = "{1_200_000_001}")
+    @NotBlank(message = "{1_099_000_001}")
     private String status;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/permission/role/MdeRoleSaveReqVO.java

@@ -28,7 +28,7 @@ public class MdeRoleSaveReqVO {
     private String code;
 
     @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "{1_200_000_003}")
+    @NotNull(message = "{1_099_000_003}")
     @DiffLogField(name = "显示顺序")
     private Integer sort;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/school/SchoolSaveReqVO.java

@@ -40,7 +40,7 @@ public class SchoolSaveReqVO {
     private String latitude;
 
     @Schema(description = "帐号状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotBlank(message = "{1_200_000_001}")
+    @NotBlank(message = "{1_099_000_001}")
     private String status;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/MdeUserSaveReqVO.java

@@ -33,7 +33,7 @@ public class MdeUserSaveReqVO {
     private String avatar;
 
     @Schema(description = "帐号状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotBlank(message = "{1_200_000_001}")
+    @NotBlank(message = "{1_099_000_001}")
     private String status;
 
     @Schema(description = "注册 IP")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/MdeUserUpdateStatusReqVO.java

@@ -17,8 +17,8 @@ public class MdeUserUpdateStatusReqVO {
     private Long id;
 
     @Schema(description = "状态，见 MendunerStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotBlank(message = "{1_200_000_001}")
-    @InEnum(value = MendunerStatusEnum.class, message = "{1_200_000_002}")
+    @NotBlank(message = "{1_099_000_001}")
+    @InEnum(value = MendunerStatusEnum.class, message = "{1_099_000_002}")
     private String status;
 
 }

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

@@ -84,4 +84,10 @@ public interface JobCvRelService {
      */
     boolean eliminate(List<Long> ids);
 
+    /**
+     * 入职
+     *
+     * @param ids 投递简历ids
+     */
+    boolean entry(List<Long> ids);
 }

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

@@ -138,4 +138,15 @@ public class JobCvRelServiceImpl implements JobCvRelService {
         }
         return true;
     }
+
+    @Override
+    @DSTransactional
+    public boolean entry(List<Long> ids) {
+        for (Long id : ids) {
+            JobCvRelDO jobCvRel = validateJobCvRelExists(id);
+            jobCvRel.setStatus(JobCvRelStatusEnum.ENTRY.getStatus());
+            jobCvRelMapper.updateById(jobCvRel);
+        }
+        return true;
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/LoginUserContext.java

@@ -22,8 +22,7 @@ public class LoginUserContext {
      **/
     public static LoginUser get() {
         LoginUser loginUser = getLoginUser();
-        if (null == loginUser
-                || null == loginUser.getInfo()) {
+        if (null == loginUser) {
             // 没权限
             throw exception(FORBIDDEN);
         }

menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -17,14 +17,14 @@
 900=duplicate request, please try again later # duplicate request
 901=demonstration mode, write operation prohibited
 999=unknown error
-# ========== 公共 1_200_000_000 ==========
-1_200_000_001=Status cannot be empty
-1_200_000_002=The modification status must be {value}
-1_200_000_003=Display order cannot be empty
-1_200_000_004=Superior ID cannot be empty
-1_200_000_005=id cannot be empty
-1_200_000_006=User ID cannot be empty
-1_200_000_007=Enterprise ID cannot be empty
+# ========== 公共 1_099_000_000 ==========
+1_099_000_001=Status cannot be empty
+1_099_000_002=The modification status must be {value}
+1_099_000_003=Display order cannot be empty
+1_099_000_004=Superior ID cannot be empty
+1_099_000_005=id cannot be empty
+1_099_000_006=User ID cannot be empty
+1_099_000_007=Enterprise ID cannot be empty
 # ========== 人才信息-人才档案 1_100_001_000 ==========
 1_100_001_001=Personal Profile Does Not Exist
 1_100_001_002=Personal advantage cannot be empty

menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -17,14 +17,14 @@
 900=重复请求，请稍后重试 # 重复请求
 901=演示模式，禁止写操作
 999=未知错误
-# ========== 公共 1_200_000_000 ==========
-1_200_000_001=帐号状态不能为空
-1_200_000_002=修改状态必须是 {value}
-1_200_000_003=显示顺序不能为空
-1_200_000_004=上级id不能为空
-1_200_000_005=id不能为空
-1_200_000_006=用户id不能为空
-1_200_000_007=企业id不能为空
+# ========== 公共 1_099_000_000 ==========
+1_099_000_001=帐号状态不能为空
+1_099_000_002=修改状态必须是 {value}
+1_099_000_003=显示顺序不能为空
+1_099_000_004=上级id不能为空
+1_099_000_005=id不能为空
+1_099_000_006=用户id不能为空
+1_099_000_007=企业id不能为空
 # ========== 人才信息-人才档案 1_100_001_000 ==========
 1_100_001_001=人才档案不存在
 1_100_001_002=人才优势不能为空
@@ -220,7 +220,7 @@
 1_200_019_002=用户申请已审批
 1_200_019_003=用户申请申请已审批通过,无法拒绝
 1_200_019_005=已申请审核中,请勿重复提交
-# ========== 招聘职位简历投递 1_200_019_000 ==========
+# ========== 招聘职位简历投递 1_200_020_000 ==========
 1_200_020_001=招聘职位简历投递不存在
 1_200_020_002=该职位已投递
 1_200_020_003=未选择简历附件