diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index 930fedcb..3eda65b2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -229,7 +229,7 @@ public class RepairAuditDetailsController extends BaseController { */ @ApiOperation(value = "(内层)批量修改修试审核详细") @PreventRepeatSubmit - @RequiresPermissions("repair:details:edit") + //@RequiresPermissions("repair:details:edit") @SysLog(title = "批量修试审核详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->批量修改修试审核详细") @PostMapping("/innerAudit") public AjaxResult edit(@RequestBody @NotNull List repairAuditDetails) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java index 2e4e7bb4..498b0941 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java @@ -101,4 +101,11 @@ public interface RepairApplyDetailsMapper { * @return */ int updateRepairApplyDetailsAfterAudit(RepairAuditDetails dto); + + /** + * 根据back_id获取最大level + * @param backId + * @return + */ + RepairTaskDetails getMaxLevel(Long backId); } 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 4aa4226e..3e4192a5 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 @@ -549,7 +549,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService String level = null; if (!CollectionUtils.isEmpty(detailsList)) { backId = detailsList.get(0).getBackId(); - level = detailsList.get(0).getLevel(); + // 根据backId查询最大级level + RepairTaskDetails details = repairApplyDetailsMapper.getMaxLevel(backId); + if (details != null) { + level = details.getLevel(); + } } /*if (Objects.nonNull(preTmTaskInfo) && Objects.nonNull(preTmTaskInfo.getPreTaskId())) { taskMapper.updateTaskStatus(String.valueOf(preTmTaskInfo.getPreTaskId()), RepairTaskStatusEnum.TASK_STATUS_PROCESSING.getStatus()); @@ -662,13 +666,39 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService final Long agreementId = taskAgreementMapper.selectAgreementIdByTaskId(auditDetails1.getTaskId()); batchInsertRepairInputDetails(scrapApplyDetails,repairAuditDetails, agreementId); } else if ("2".equals(status)) { - for (final RepairAuditDetails auditDetails : repairAuditDetails) { - repairApplyDetailsMapper.updateRepairApplyDetailsAfterReject( - ObjectUtils.defaultIfNull(auditDetails.getRepairedNum(),0).longValue(), - ObjectUtils.defaultIfNull(auditDetails.getScrapNum(),0).longValue(), auditDetails.getRepairId()); - repairApplyDetailsMapper.updateStatus(auditDetails.getRepairId(), RepairTaskStatusEnum.TASK_STATUS_PROCESSING.getStatus()); + RepairTask task = new RepairTask(); + task.setTaskId(dto.getTaskId()); + Long agreementId = repairMapper.getAgreementId(task); + // 插入任务表 + Long newTaskId = insertWxTt(SecurityUtils.getLoginUser().getSysUser().getNickName()); + // 插入协议任务表 + insertTta(newTaskId, agreementId); + // 处理 -- 修饰审核任务状态 + //taskMapper.updateTaskStatus(String.valueOf(dto.getTaskId()), RepairTaskStatusEnum.TASK_STATUS_NO_REVIEW.getStatus()); + List detailsList = repairApplyDetailsMapper.getRepairDetailsWhichNotSent(dto.getTaskId()); + Long backId = null; + String level = null; + if (!CollectionUtils.isEmpty(detailsList)) { + backId = detailsList.get(0).getBackId(); + // 根据backId查询最大级level + RepairTaskDetails details = repairApplyDetailsMapper.getMaxLevel(backId); + if (details != null) { + level = details.getLevel(); + } + } + for (RepairAuditDetails repairAuditDetail : repairAuditDetails) { + RepairTaskDetails repairTaskDetails = new RepairTaskDetails(); + repairTaskDetails.setNewTaskId(newTaskId); + repairTaskDetails.setMaId(repairAuditDetail.getMaId() == null ? null : repairAuditDetail.getMaId().toString()); + repairTaskDetails.setTypeId(repairAuditDetail.getTypeId().toString()); + repairTaskDetails.setRepairNum(repairAuditDetail.getRepairNum()); + repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); + repairTaskDetails.setBackId(backId); + if(StringUtils.isNotBlank( level)) { + repairTaskDetails.setLevel(String.valueOf(Integer.parseInt(level) + 1)); + } + repairMapper.insertRepaired(repairTaskDetails); } - taskMapper.updateTaskStatus(dto.getTaskId().toString(), RepairTaskStatusEnum.TASK_STATUS_PROCESSING.getStatus()); } try { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml index c9616408..fcdd0480 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml @@ -214,6 +214,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{repairId} + + delete from repair_apply_details where id = #{id} 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 cd3c3f1c..d4ec8416 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 @@ -374,7 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"