From 21ce286933dd997c0434edc4dc1ed6661aaeb83e Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 17 Dec 2024 16:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/constant/MaterialConstants.java | 8 ++++---- .../java/com/bonus/common/biz/enums/TmTaskTypeEnum.java | 6 +++++- .../lease/service/impl/LeaseRepairRecordServiceImpl.java | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java index 43af17c..9a5c843 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java @@ -60,15 +60,15 @@ public class MaterialConstants { public static final String OUTER_PROTOCAL = "2"; //外部单位协议 /** 文件类型：设备附件 */ - public static final Integer MATERIAL_FILE_TYPE_CODE = 17; + public static final Integer MATERIAL_FILE_TYPE_CODE = 17; //move to TmTaskTypeEnum /** 文件类型：租赁需求附件 */ - public static final Integer LEASE_FILE_TYPE_CODE = 18; + public static final Integer LEASE_FILE_TYPE_CODE = 18; //move to TmTaskTypeEnum /** 文件类型：退租检修图片类型 */ - public static final Integer LEASE_REPAIR_RECORD_TABLE_NAME = 19; + //public static final Integer LEASE_REPAIR_RECORD_TABLE_NAME = 19; //move to TmTaskTypeEnum /** 文件类型：合同照片 */ - public static final Integer APPENDICES_OF_CONTRACT = 20; + //public static final Integer APPENDICES_OF_CONTRACT = 20; //move to TmTaskTypeEnum } 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 e5fee95..b45d22a 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 @@ -15,7 +15,11 @@ public enum TmTaskTypeEnum { TM_TASK_SETTLEMENT(7, "结算任务"), TM_TASK_CHECK(8, "检验任务"), TM_TASK_FACTORY_MANAGEMENT(9, "物资厂家管理任务"), - TM_TASK_AGREEMENT_MANAGEMENT(10, "新增协议任务"); + TM_TASK_AGREEMENT_MANAGEMENT(10, "新增协议任务"), + TM_TASK_ADD_DEVICE_TASK(17, "新增商城物资任务"), + TM_TASK_ADD_REQUIREMENT_TASK(18, "新增商城需求任务"), + TM_TASK_ADD_REPAIR_TASK(19, "新增商城退租检修任务"), + TM_TASK_ADD_CONTRACT_TASK(20, "新增商城合同任务"); private final Integer taskTypeId; private final String taskTypeName; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java index f9e79a4..30c9d92 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java @@ -4,6 +4,7 @@ import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.biz.enums.OrderStatusEnum; +import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; @@ -148,7 +149,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { } BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(Long.valueOf(leaseRepairRecord.getMaId())); - bmFileInfo.setTaskType(MaterialConstants.LEASE_REPAIR_RECORD_TABLE_NAME); + bmFileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_ADD_REPAIR_TASK.getTaskTypeId()); fileList.addAll(bmFileInfoMapper.selectBmFileInfoList(bmFileInfo)); if (leaseRecordDto.getRepairRecordList() == null) { leaseRecordDto.setRepairRecordList(new ArrayList<>());