diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index c0a75bb6..7555ef99 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -95,7 +95,7 @@ public class RepairController extends BaseController { */ @ApiOperation(value = "获取维修单详情") @GetMapping("/getRepairDocumentInfo") - public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") String taskId) { + public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") Long taskId) { return service.getRepairDocumentInfo(taskId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java index 5b0c6ea1..75b88e8c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java @@ -17,7 +17,7 @@ public class RepairTask { * 任务id */ @ApiModelProperty(value = "任务id") - private String taskId; + private Long taskId; @ApiModelProperty(value = "任务状态") private Integer taskStatus; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java index 1d9f466f..60173576 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java @@ -23,7 +23,7 @@ public class RepairTaskDetails extends BaseEntity { * 任务ID */ @ApiModelProperty(value = "任务ID") - private String taskId; + private Long taskId; /** * 机具ID */ @@ -98,7 +98,7 @@ public class RepairTaskDetails extends BaseEntity { @ApiModelProperty(value = "关键字") private String keyword; - public RepairTaskDetails(String taskId) { + public RepairTaskDetails(Long taskId) { this.taskId = taskId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index 604c3b0c..297f817d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -79,6 +79,8 @@ public interface RepairAuditDetailsMapper { */ int deleteRepairAuditDetailsById(Long id); + int deleteRepairAuditDetailsByTaskId(Long taskId); + /** * 批量删除修试审核详细 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java index 28e9b47c..4a6a5f41 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java @@ -43,7 +43,7 @@ public interface RepairService { /** * 查询维修单 */ - AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") String taskId); + AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") Long taskId); /** * 提交维修记录 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 11113ddf..d82b4979 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -285,7 +285,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService Long backId = repairAuditDetailsMapper.getBackId(inputDetails.getRepairId()); /* 添加驳回后维修详细表数据*/ RepairTaskDetails repairTaskDetails = new RepairTaskDetails(); - repairTaskDetails.setTaskId(String.valueOf(inputTaskId)); + repairTaskDetails.setTaskId(inputTaskId); repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId())); repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId())); Integer repairNum = inputDetails.getRepairNum(); 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 a7a8c888..424d0812 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 @@ -154,14 +154,10 @@ public class RepairServiceImpl implements RepairService { * @param taskId 任务id */ @Override - public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") String taskId) { - if (!NumberUtil.isNumber(taskId)) { - return AjaxResult.error("TaskId参数非数字类型,参数类型错误"); - } + public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") Long taskId) { try { - long thisTaskId = Long.parseLong(taskId); // 查询维修任务信息 - RepairTask repairTaskInfo = repairMapper.getRepairTaskInfoByTaskId(thisTaskId); + RepairTask repairTaskInfo = repairMapper.getRepairTaskInfoByTaskId(taskId); if (Objects.isNull(repairTaskInfo)) { return AjaxResult.error("未查询到维修任务信息"); } @@ -181,14 +177,14 @@ public class RepairServiceImpl implements RepairService { repairDeviceSummaryList.removeIf(Objects::isNull); repairDeviceSummaryList.forEach(repairDevice -> { List fileInfos = bmFileInfoMapper.selectBmFileInfoList(new BmFileInfo() - .setTaskId(OptionalLong.of(thisTaskId).orElse(0L)) + .setTaskId(OptionalLong.of(taskId).orElse(0L)) .setModelId(Optional.ofNullable(repairDevice.getIds()[0]).orElse(0L)) .setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) ); repairDevice.setFileList(fileInfos); }); - List repairPartList = repairAuditDetailsMapper.getPartDetailsByTaskId(new RepairAuditDetails().setTaskId(thisTaskId)); + List repairPartList = repairAuditDetailsMapper.getPartDetailsByTaskId(new RepairAuditDetails().setTaskId(taskId)); repairPartList = mergePartsNum(repairPartList); RepairTicketVo result = new RepairTicketVo() .setRepairTaskInfo(repairTaskInfo) @@ -384,7 +380,7 @@ public class RepairServiceImpl implements RepairService { for (RepairTaskDetails bean : list) { int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); RepairApplyRecord repairRecord = new RepairApplyRecord(); - repairRecord.setTaskId(Long.valueOf(bean.getTaskId())); + repairRecord.setTaskId(bean.getTaskId()); repairRecord.setMaId(Long.valueOf(bean.getMaId())); repairRecord.setTypeId(Long.valueOf(bean.getTypeId())); repairRecord.setRepairNum(repairedNum); @@ -810,6 +806,7 @@ public class RepairServiceImpl implements RepairService { repairMapper.addTask(task); // 循环插入【修饰审核明细表】 + repairAuditDetailsMapper.deleteRepairAuditDetailsByTaskId(task.getTaskId()); for (RepairTaskDetails details : detailsList) { details.setCreateBy(String.valueOf(loginUser.getUserid())); details.setTaskId(task.getTaskId()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 5983a386..940f785d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -261,6 +261,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from repair_audit_details where id = #{id} + + delete from repair_audit_details where task_id = #{taskId} + + delete from repair_audit_details where id in