BJ_FS / urbanops

Commit 77cdab49c3176785992bf087cdfe2d49f899dc66

Authored by wangqian
1 parent cb7b2150

派单及人机材功能迁移

Inline Side-by-side
Showing 3 changed files with 19 additions and 32 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java
  View file @77cdab4
... ... @@ -15,42 +15,41 @@ public interface ErrorCodeConstants {
15 15  
16 16 ErrorCode ASSIGN_TASKS_NOT_EXISTS_001 = new ErrorCode(1-100-001-001, "派单任务主表（记录派单任务基本信息）不存在");
17 17 ErrorCode ASSIGN_TASKS_NOT_EXISTS_002 = new ErrorCode(1-100-001-002, "未全部完成，不能确认");
  18 + ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_001 = new ErrorCode(1-100-001-003, "派发单位不能为空");
18 19  
19   - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS = new ErrorCode(1-100-002-000, "派发单位不能为空");
20   -
21   - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_100 = new ErrorCode(1-100-002-100, "用户未登录");
22   -
23   - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_001 = new ErrorCode(1-100-002-001, "派发单位不能为空");
24   -
25   - ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_002 = new ErrorCode(1-100-002-002, "派单已完成，不允许删除");
  20 + ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_004 = new ErrorCode(1-100-002-004, "派单已完成，不允许删除");
26 21  
27 22 ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS_003 = new ErrorCode(1-100-002-003, "更新派单任务失败：任务ID不能为空");
28 23  
  24 + ErrorCode ASSIGN_TASKS_INFO_NOT_EXISTS = new ErrorCode(1-100-002-000, "派发单位不能为空");
  25 +
29 26 // ========== 人机材料 1-100-003-000==========
30 27  
31 28 ErrorCode COST_FEE_NOT_EXISTS = new ErrorCode(1-100-003-000, "费用已录入");
32 29  
33   - // ========== 部门费用费用 1-100-005-000==========
  30 + // ========== 部门费用费用 ==========
34 31 ErrorCode DEPARTMENT_COST_NOT_EXISTS_01 = new ErrorCode(1-100-003-001, "部门费用为空");
35 32  
36   - // ========== 人员费用 1-100-005-000==========
37   - ErrorCode PERSONAL_COST_NOT_EXISTS = new ErrorCode(1-100-004-000, "人员费用为空");
  33 + // ========== 人员费用 ==========
  34 + ErrorCode PERSONAL_COST_NOT_EXISTS = new ErrorCode(1-100-003-002, "人员费用为空");
38 35  
39   - ErrorCode PERSONAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-004-001, "参数错误");
  36 + ErrorCode PERSONAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-003-003, "参数错误");
40 37  
41   - // ========== 自有机械材料 1-100-005-000==========
42   - ErrorCode MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-005-000, "费用已录入");
43   - ErrorCode MECHANICAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-005-001, "参数错误");
  38 + // ========== 自有机械材料 ==========
  39 + ErrorCode MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-003-004, "费用已录入");
  40 + ErrorCode MECHANICAL_COST_NOT_EXISTS_001 = new ErrorCode(1-100-003-005, "参数错误");
44 41  
45   - // ========== 自有机械折旧 1-100-006-000==========
  42 + // ========== 自有机械折旧 ==========
46 43  
47   - ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS = new ErrorCode(1-100-006-000, "参数错误");
  44 + ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS = new ErrorCode(1-100-003-006, "参数错误");
48 45  
49   - ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS_001 = new ErrorCode(1-100-006-001, "参数错误");
  46 + ErrorCode MECHANICAL_DEPRECIATION_NOT_EXISTS_001 = new ErrorCode(1-100-003-007, "参数错误");
50 47  
51 48  
52   - // ========== 租赁机械 1-100-007-000==========
53   - ErrorCode RENTAL_MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-007-000, "费用已录入");
  49 + // ========== 租赁机械 ==========
  50 + ErrorCode RENTAL_MECHANICAL_COST_NOT_EXISTS = new ErrorCode(1-100-003-011, "费用已录入");
54 51  
  52 + ErrorCode WASTE_RECORD_NOT_EXISTS = new ErrorCode(1-100-003-012, "园林废弃物录入不存在");
55 53  
  54 + ErrorCode WATER_FEE_NOT_EXISTS = new ErrorCode(1-100-003-013, "水费录入信息不存在");
56 55 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
  View file @77cdab4
... ... @@ -143,7 +143,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
143 143 if (Objects.equals(existingTask.getFinish(), 1)) {
144 144 log.error("删除派单失败：任务已读不允许删除 | 派单ID：{}，公司ID：{}",
145 145 existingTask.getId(), existingCompanyIdStr);
146   - throw exception(ASSIGN_TASKS_INFO_NOT_EXISTS_002); // 建议修改异常码语义为“已读任务不允许删除”
  146 + throw exception(ASSIGN_TASKS_INFO_NOT_EXISTS_004); // 建议修改异常码语义为“已读任务不允许删除”
147 147 }
148 148 needDeleteIds.add(existingTask.getId());
149 149 }
... ...
urbanops-module-garden/src/main/resources/mapper/mechanicalcost/MechanicalCostMapper.xml deleted
View file @cb7b215
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="com.zteits.urbanops.module.garden.dal.mysql.mechanicalcost.MechanicalCostMapper">
4   -
5   - <!--
6   - 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
7   - 无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
8   - 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
9   - 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
10   - -->
11   -
12   -</mapper>
13 0 \ No newline at end of file