Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq

This commit is contained in:
BianLzhaoMin 2024-06-04 17:02:38 +08:00
commit 793d29c1ec
1 changed files with 3 additions and 3 deletions

View File

@ -201,7 +201,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
List<BackApplyInfo> bfList = backReceiveMapper.getBfList(record);
if (bfList != null && bfList.size() > 0) {
//插入任务表tm_task
int newTaskId = insertTt(bfList, TaskTypeEnum.RETURNED_MATERIALS_TO_BE_SCRAPPED.getCode(), record.getCreateBy());
int newTaskId = insertTt(bfList, TaskTypeEnum.SCRAP_TASK.getCode(), record.getCreateBy());
//插入协议任务表tm_task_agreement
res = insertTta(newTaskId, bfList);
//插入维修记录表scrap_apply_details
@ -405,9 +405,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//taskStatus = "43";
taskStatus = TaskStatusEnum.REPAIRING.getCode();
}
if (TaskTypeEnum.RETURNED_MATERIALS_TO_BE_SCRAPPED.getCode().equals(taskType)) {
if (TaskTypeEnum.SCRAP_TASK.getCode().equals(taskType)) {
//taskStatus = "120";
taskStatus = TaskStatusEnum.PENDING_REVIEW.getCode();
taskStatus = TaskStatusEnum.SCRAP_UNDER_REVIEW.getCode();
}
applyInfo.setTaskStatus(taskStatus);
applyInfo.setCode(code);