派单及人机材功能迁移

wangqian
1 parent cb7b2150
Showing 3 changed files with 19 additions and 32 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/mechanicalcost/MechanicalCostMapper.xml
@@ -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, "水费录入信息不存在");
 }
@@ -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());
             }
-<?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.zteits.urbanops.module.garden.dal.mysql.mechanicalcost.MechanicalCostMapper">
-
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-</mapper>
 \ No newline at end of file