错误码修改

zjugis-business/src/main/java/com/zjugis/business/enums/ErrorCodeConstants.java

@@ -5,47 +5,49 @@ import com.zjugis.framework.common.exception.ErrorCode;
 /**
  * adm 错误码枚举类
  *
- * system 系统，使用 1-003-000-000 段
+ * system 系统，使用 1_003_000_000 段
  */
 public interface ErrorCodeConstants {
 
-    // ========== LEAVE 请假模块 3-001-000-000 ==========
-    ErrorCode LEAVE_NOT_EXISTS = new ErrorCode(3-001-000-000, "请假记录不存在");
-    // ========== ATTENDANCE_NOTE 考勤说明条模块 3-001-001-000 ==========
-    ErrorCode ATTENDANCE_NOTE_NOT_EXISTS = new ErrorCode(3-001-001-000, "考勤说明条记录不存在");
-    // ========== TRAVEL 出差模块 3-001-002-000 ==========
-    ErrorCode BUSINESS_TRAVEL_NOT_EXISTS = new ErrorCode(3-001-002-000, "出差记录不存在");
-    // ========== COMMON_COST 普通报销模块 3-001-003-000 ==========
-    ErrorCode COMMON_COST_NOT_EXISTS = new ErrorCode(3-001-003-000, "普通报销记录不存在");
-    // ========== TRAVEL_COST 差旅报销模块 3-001-007-000 ==========
-    ErrorCode TRAVEL_COST_NOT_EXISTS = new ErrorCode(3-001-007-000, "差旅费报销记录不存在");
-    // ========== ATTENDANCE_NOTE 招聘模块 3-001-004-000 ==========
-    ErrorCode RECRUIT_DEMAND_NOT_EXISTS = new ErrorCode(3-001-004-000, "招聘需求记录不存在");
-    ErrorCode STAFF_NOT_EXISTS = new ErrorCode(3-001-004-001, "入职办理记录不存在");
-    ErrorCode REGULAR_NOT_EXISTS = new ErrorCode(3-001-004-002, "转正申请记录不存在");
-    ErrorCode TRANSFER_NOT_EXISTS = new ErrorCode(3-001-004-003, "调岗申请记录不存在");
-    ErrorCode RESIGN_NOT_EXISTS = new ErrorCode(3-001-004-004, "离职办理记录不存在");
-    ErrorCode INTERVIEW_NOT_EXISTS = new ErrorCode(3-001-004-005, "面试记录不存在");
-
-    ErrorCode RESIGN_DETAIL_NOT_EXISTS = new ErrorCode(3-001-004-006, "工作交接人不能为空");
-
-    ErrorCode RESIGN_APPLY_NOT_EXISTS = new ErrorCode(3-001-004-007, "离职申请记录不存在");
-
-    ErrorCode RESIGN_APPLY_FIRST = new ErrorCode(3-001-004-010, "请先办理离职申请");
-    ErrorCode ID_CARD_EXIST = new ErrorCode(3-001-005-001, "身份证号已经存在");
-    ErrorCode MOBILE_EXIST = new ErrorCode(3-001-005-003, "手机号已经存在");
-    ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(3-001-003-000, "供应商入库申请记录不存在");
-    ErrorCode SEAL_NOT_EXISTS = new ErrorCode(3-001-006-000, "公章申请记录不存在");
-
-    ErrorCode CONTRACT_F_NOT_EXISTS = new ErrorCode(3-001-007-001, "合同记录不存在");
-
-    ErrorCode INTERN_NOT_EXISTS = new ErrorCode(1001, "录用申请记录不存在");
-    // ========== PROJECT_REPORT 项目产值填报 3-002-001-000 ==========
-
-    ErrorCode REPORT_PERIOD_IS_EXISTS = new ErrorCode(3-002-001-001, "当前已有开启的填报期号");
-    ErrorCode REPORT_PERIOD_NOT_EXISTS = new ErrorCode(3-002-001-002, "当前没有开启的填报期号");
-    ErrorCode REPORT_IS_EXISTS = new ErrorCode(3-002-001-002, "该项目当前期号已填报");
-    ErrorCode REPORT_IS_SUBMITTED = new ErrorCode(3-002-001-002, "该项目填报已提交");
-    ErrorCode REPORT_IS_NOT_AUDIT = new ErrorCode(3-002-001-002, "该项目填报状态不是待审核");
+    // ========== LEAVE 请假模块 1_003_000_000 ==========
+    ErrorCode LEAVE_NOT_EXISTS = new ErrorCode(1_003_001_000, "请假记录不存在");
+    // ========== ATTENDANCE_NOTE 考勤说明条模块 1_003_003_000 ==========
+    ErrorCode ATTENDANCE_NOTE_NOT_EXISTS = new ErrorCode(1_003_002_000, "考勤说明条记录不存在");
+    // ========== TRAVEL 出差模块 1_003_002_000 ==========
+    ErrorCode BUSINESS_TRAVEL_NOT_EXISTS = new ErrorCode(1_003_003_000, "出差记录不存在");
+    // ========== COMMON_COST 普通报销模块 1_003_003_000 ==========
+    ErrorCode COMMON_COST_NOT_EXISTS = new ErrorCode(1_003_004_000, "普通报销记录不存在");
+    // ========== TRAVEL_COST 差旅报销模块 1_003_007_000 ==========
+    ErrorCode TRAVEL_COST_NOT_EXISTS = new ErrorCode(1_003_005_000, "差旅费报销记录不存在");
+    // ========== ATTENDANCE_NOTE 招聘模块 1_003_004_000 ==========
+    ErrorCode RECRUIT_DEMAND_NOT_EXISTS = new ErrorCode(1_003_006_000, "招聘需求记录不存在");
+    ErrorCode STAFF_NOT_EXISTS = new ErrorCode(1_003_006_003, "入职办理记录不存在");
+    ErrorCode REGULAR_NOT_EXISTS = new ErrorCode(1_003_006_002, "转正申请记录不存在");
+    ErrorCode TRANSFER_NOT_EXISTS = new ErrorCode(1_003_006_003, "调岗申请记录不存在");
+    ErrorCode RESIGN_NOT_EXISTS = new ErrorCode(1_003_006_004, "离职办理记录不存在");
+    ErrorCode INTERVIEW_NOT_EXISTS = new ErrorCode(1_003_006_005, "面试记录不存在");
+
+    ErrorCode RESIGN_DETAIL_NOT_EXISTS = new ErrorCode(1_003_006_006, "工作交接人不能为空");
+
+    ErrorCode RESIGN_APPLY_NOT_EXISTS = new ErrorCode(1_003_006_007, "离职申请记录不存在");
+
+    ErrorCode RESIGN_APPLY_FIRST = new ErrorCode(1_003_006_010, "请先办理离职申请");
+    ErrorCode ID_CARD_EXIST = new ErrorCode(1_003_007_003, "身份证号已经存在");
+    ErrorCode MOBILE_EXIST = new ErrorCode(1_003_007_003, "手机号已经存在");
+    ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_003_008_000, "供应商入库申请记录不存在");
+    ErrorCode SEAL_NOT_EXISTS = new ErrorCode(1_003_009_000, "公章申请记录不存在");
+
+    ErrorCode CONTRACT_F_NOT_EXISTS = new ErrorCode(1_003_010_003, "合同记录不存在");
+
+    ErrorCode INTERN_NOT_EXISTS = new ErrorCode(1003, "录用申请记录不存在");
+    // ========== PROJECT_REPORT 项目产值填报 1_002_003_000 ==========
+
+    ErrorCode REPORT_PERIOD_IS_EXISTS = new ErrorCode(1_003_011_001, "当前已有开启的填报期号");
+    ErrorCode REPORT_PERIOD_NOT_EXISTS = new ErrorCode(1_003_011_002, "当前没有开启的填报期号");
+    ErrorCode REPORT_IS_EXISTS = new ErrorCode(1_003_011_003, "该项目当前期号已填报");
+    ErrorCode REPORT_IS_NOT_EXISTS = new ErrorCode(1_003_011_004, "该项目当前期号填报不存在");
+    ErrorCode REPORT_IS_SUBMITTED = new ErrorCode(1_003_011_005, "该项目填报已提交");
+    ErrorCode REPORT_IS_NOT_AUDIT = new ErrorCode(1_003_011_006, "该项目填报状态不是待审核");
+
 
 }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectReportServiceImpl.java

@@ -107,8 +107,8 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     @Override
     public void commit(String id) {
         ProjectReport projectReport = projectReportMapper.selectById(id);
-        if (ObjectUtil.isNotNull(projectReport)) {
-            throw exception(REPORT_IS_EXISTS);
+        if (ObjectUtil.isNull(projectReport)) {
+            throw exception(REPORT_IS_NOT_EXISTS);
         }
         //填报待审核或者已通过不允许修改
         if (ProjectReportStatusEnum.AUDIT.getValue().equals(projectReport.getReportStatus()) || (ProjectReportStatusEnum.PASS.getValue().equals(projectReport.getReportStatus()))) {
@@ -131,8 +131,8 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     @Override
     public void pass(ProjectReportAuditPassRequest reqVO) {
         ProjectReport projectReport = projectReportMapper.selectById(reqVO.getReportId());
-        if (ObjectUtil.isNotNull(projectReport)) {
-            throw exception(REPORT_IS_EXISTS);
+        if (ObjectUtil.isNull(projectReport)) {
+            throw exception(REPORT_IS_NOT_EXISTS);
         }
         if (!ProjectReportStatusEnum.AUDIT.getValue().equals(projectReport.getReportStatus())) {
             throw exception(REPORT_IS_NOT_AUDIT);
@@ -164,8 +164,8 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     @Override
     public void reject(ProjectReportAuditRejectRequest reqVO) {
         ProjectReport projectReport = projectReportMapper.selectById(reqVO.getReportId());
-        if (ObjectUtil.isNotNull(projectReport)) {
-            throw exception(REPORT_IS_EXISTS);
+        if (ObjectUtil.isNull(projectReport)) {
+            throw exception(REPORT_IS_NOT_EXISTS);
         }
         if (!ProjectReportStatusEnum.AUDIT.getValue().equals(projectReport.getReportStatus())) {
             throw exception(REPORT_IS_NOT_AUDIT);