bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2024-12-17 19:43:05 +08:00
parent 6b218f8d3d 96703df793
commit 6db52fe17d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
View File

@ -60,15 +60,15 @@ public class MaterialConstants {
public static final String OUTER_PROTOCAL = "2"; //外部单位协议 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
} }

6
bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java
View File

@ -15,7 +15,11 @@ public enum TmTaskTypeEnum {
TM_TASK_SETTLEMENT(7, "结算任务"), TM_TASK_SETTLEMENT(7, "结算任务"),
TM_TASK_CHECK(8, "检验任务"), TM_TASK_CHECK(8, "检验任务"),
TM_TASK_FACTORY_MANAGEMENT(9, "物资厂家管理任务"), 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 Integer taskTypeId;
private final String taskTypeName; private final String taskTypeName;

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.bonus.common.biz.constant.MaterialConstants;
import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.domain.BmFileInfo;
import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.biz.enums.HttpCodeEnum;
import com.bonus.common.biz.enums.OrderStatusEnum; 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.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
@ -148,7 +149,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
} }
BmFileInfo bmFileInfo = new BmFileInfo(); BmFileInfo bmFileInfo = new BmFileInfo();
bmFileInfo.setModelId(Long.valueOf(leaseRepairRecord.getMaId())); 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)); fileList.addAll(bmFileInfoMapper.selectBmFileInfoList(bmFileInfo));
if (leaseRecordDto.getRepairRecordList() == null) { if (leaseRecordDto.getRepairRecordList() == null) {
leaseRecordDto.setRepairRecordList(new ArrayList<>()); leaseRecordDto.setRepairRecordList(new ArrayList<>());