From 77cdab49c3176785992bf087cdfe2d49f899dc66 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Thu, 20 Nov 2025 10:41:42 +0800 Subject: [PATCH] 派单及人机材功能迁移 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java | 37 ++++++++++++++++++------------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java | 2 +- urbanops-module-garden/src/main/resources/mapper/mechanicalcost/MechanicalCostMapper.xml | 12 ------------ 3 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 urbanops-module-garden/src/main/resources/mapper/mechanicalcost/MechanicalCostMapper.xml diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java index f33325b..674be0e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java @@ -15,42 +15,41 @@ public interface ErrorCodeConstants { ErrorCode ASSIGN_TASKS_NOT_EXISTS_001 = new ErrorCode(1-100-001-001, "派单任务主表（记录派单任务基本信息）不存在"); ErrorCode ASSIGN_TASKS_NOT_EXISTS_002 = new ErrorCode(1-100-001-002, "未全部完成，不能确认"); + ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_001 = new ErrorCode(1-100-001-003, "派发单位不能为空"); - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS = new ErrorCode(1-100-002-000, "派发单位不能为空"); - - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_100 = new ErrorCode(1-100-002-100, "用户未登录"); - - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_001 = new ErrorCode(1-100-002-001, "派发单位不能为空"); - - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_002 = new ErrorCode(1-100-002-002, "派单已完成，不允许删除"); + ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_004 = new ErrorCode(1-100-002-004, "派单已完成，不允许删除"); ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_003 = new ErrorCode(1-100-002-003, "更新派单任务失败：任务ID不能为空"); + ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS = new ErrorCode(1-100-002-000, "派发单位不能为空"); + // ========== 人机材料 1-100-003-000========== ErrorCode COST_FEE_NOT_EXISTS = new ErrorCode(1-100-003-000, "费用已录入"); - // ========== 部门费用费用 1-100-005-000========== + // ========== 部门费用费用 ========== ErrorCode DEPARTMENT_COST_NOT_EXISTS_01 = new ErrorCode(1-100-003-001, "部门费用为空"); - // ========== 人员费用 1-100-005-000========== - ErrorCode PERSONAL_COST_NOT_EXISTS = new ErrorCode(1-100-004-000, "人员费用为空"); + // ========== 人员费用 ========== + ErrorCode PERSONAL_COST_NOT_EXISTS = new ErrorCode(1-100-003-002, "人员费用为空"); - ErrorCode PERSONAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-004-001, "参数错误"); + ErrorCode PERSONAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-003-003, "参数错误"); - // ========== 自有机械材料 1-100-005-000========== - ErrorCode MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-005-000, "费用已录入"); - ErrorCode MECHANICAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-005-001, "参数错误"); + // ========== 自有机械材料 ========== + ErrorCode MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-003-004, "费用已录入"); + ErrorCode MECHANICAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-003-005, "参数错误"); - // ========== 自有机械折旧 1-100-006-000========== + // ========== 自有机械折旧 ========== - ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS = new ErrorCode(1-100-006-000, "参数错误"); + ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS = new ErrorCode(1-100-003-006, "参数错误"); - ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS_001 = new ErrorCode(1-100-006-001, "参数错误"); + ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS_001 = new ErrorCode(1-100-003-007, "参数错误"); - // ========== 租赁机械 1-100-007-000========== - ErrorCode RENTAL_MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-007-000, "费用已录入"); + // ========== 租赁机械 ========== + ErrorCode RENTAL_MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-003-011, "费用已录入"); + ErrorCode WASTE_RECORD_NOT_EXISTS = new ErrorCode(1-100-003-012, "园林废弃物录入不存在"); + ErrorCode WATER_FEE_NOT_EXISTS = new ErrorCode(1-100-003-013, "水费录入信息不存在"); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java index 9bf2a0c..e20b80e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java @@ -143,7 +143,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { if (Objects.equals(existingTask.getFinish(), 1)) { log.error("删除派单失败：任务已读不允许删除 | 派单ID：{}，公司ID：{}", existingTask.getId(), existingCompanyIdStr); - throw exception(ASSIGN_TASKS_INFO_NOT_EXISTS_002); // 建议修改异常码语义为“已读任务不允许删除” + throw exception(ASSIGN_TASKS_INFO_NOT_EXISTS_004); // 建议修改异常码语义为“已读任务不允许删除” } needDeleteIds.add(existingTask.getId()); } diff --git a/urbanops-module-garden/src/main/resources/mapper/mechanicalcost/MechanicalCostMapper.xml b/urbanops-module-garden/src/main/resources/mapper/mechanicalcost/MechanicalCostMapper.xml deleted file mode 100644 index 3116180..0000000 --- a/urbanops-module-garden/src/main/resources/mapper/mechanicalcost/MechanicalCostMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file -- libgit2 0.21.4