From 0d5673f0f26514a12ce532c1a14ef31a624aa64a Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 25 Nov 2024 11:21:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java | 2 +- .../com/bonus/material/repair/domain/RepairAuditDetails.java | 2 +- .../bonus/material/repair/service/impl/RepairServiceImpl.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java index e5fee95a..d24a5106 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java @@ -10,7 +10,7 @@ public enum TmTaskTypeEnum { TM_TASK_LEASE(2, "领料任务"), TM_TASK_BACK(3, "退料任务"), TM_TASK_REPAIR(4, "维修任务"), - TM_TASK_REPAIR_STORAGE(5, "修试后入库任务"), + TM_TASK_REPAIR_AUDIT(5, "修试后审核任务"), TM_TASK_SCRAP(6, "报废任务"), TM_TASK_SETTLEMENT(7, "结算任务"), TM_TASK_CHECK(8, "检验任务"), diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index 14578fb2..753542dd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -39,7 +39,7 @@ public class RepairAuditDetails extends BaseEntity { private String taskStatus; @ApiModelProperty(value = "任务类型编码") - private Integer taskTypeCode = TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId(); + private Integer taskType; /** 维修ID */ @ApiModelProperty(value = "维修ID") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 424d0812..557b968d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -1,7 +1,6 @@ package com.bonus.material.repair.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.NumberUtil; import com.bonus.common.biz.enums.MaTypeManageTypeEnum; import com.bonus.common.biz.enums.RepairTaskStatusEnum; import com.bonus.common.biz.enums.RepairTypeEnum; @@ -801,7 +800,7 @@ public class RepairServiceImpl implements RepairService { // 查询维修任务的详情表 List detailsList = repairMapper.getDetailsListByTaskId(task); // 新增tm_task表数据、修饰审核任务、状态是待审核 - task.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR_STORAGE.getTaskTypeId()); + task.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR_AUDIT.getTaskTypeId()); task.setTaskStatus(RepairTaskStatusEnum.TASK_STATUS_TO_EXAM.getStatus()); repairMapper.addTask(task);