diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyDetails.java index 2ad3415a..77c2f686 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyDetails.java @@ -85,4 +85,7 @@ public class RepairApplyDetails extends BaseEntity { @Excel(name = "维修人") @ApiModelProperty(value = "维修人") private String repairer; + + @ApiModelProperty(value = "前任务ID") + private Long preTaskId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index 17a5a40c..23492b5a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -137,4 +137,7 @@ public class RepairAuditDetails extends BaseEntity { @ApiModelProperty(value = "app维修审核状态,10 进行中 11已审核(包含通过和驳回)") private Integer appTaskStatus; + + @ApiModelProperty(value = "维修拆分层级") + private String level; } 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 383047c0..4aa4226e 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 @@ -546,8 +546,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService TmTask preTmTaskInfo = taskMapper.selectTmTaskByTaskId(auditDetails.getTaskId()); List detailsList = repairApplyDetailsMapper.getRepairDetailsWhichNotSent(preTmTaskInfo.getPreTaskId()); Long backId = null; + String level = null; if (!CollectionUtils.isEmpty(detailsList)) { backId = detailsList.get(0).getBackId(); + level = detailsList.get(0).getLevel(); } /*if (Objects.nonNull(preTmTaskInfo) && Objects.nonNull(preTmTaskInfo.getPreTaskId())) { taskMapper.updateTaskStatus(String.valueOf(preTmTaskInfo.getPreTaskId()), RepairTaskStatusEnum.TASK_STATUS_PROCESSING.getStatus()); @@ -570,7 +572,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService repairTaskDetails.setTypeId(repairAuditDetail.getTypeId().toString()); repairTaskDetails.setRepairNum(repairAuditDetail.getRepairNum()); repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); - repairTaskDetails.setBackId(backId == null ? null : backId); + repairTaskDetails.setBackId(backId); + if(StringUtils.isNotBlank( level)) { + repairTaskDetails.setLevel(String.valueOf(Integer.parseInt(level) + 1)); + } repairMapper.insertRepaired(repairTaskDetails); } } 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 437656d0..e4ef6cd9 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 @@ -30,7 +30,6 @@ import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.hibernate.validator.internal.util.StringHelper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -1244,11 +1243,13 @@ public class RepairServiceImpl implements RepairService { throw new ServiceException("维修驳回失败,请联系管理员"); } // 更新结算信息表 - result = sltAgreementInfoMapper.backInUseNum(repairApplyDetails); - if (result < 1) { - throw new ServiceException("维修驳回失败,请联系管理员"); - } if (repairApplyDetails != null) { + TmTask tmTask = taskMapper.selectTmTaskByTaskId(repairApplyDetails.getTaskId()); + repairApplyDetails.setPreTaskId(tmTask.getPreTaskId()); + result = sltAgreementInfoMapper.backInUseNum(repairApplyDetails); + if (result < 1) { + throw new ServiceException("维修驳回失败,请联系管理员"); + } extractedByDetails(repairApplyDetails); } } 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 c2dd2528..c9616408 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 @@ -208,7 +208,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index 477aa874..592d9f4f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -592,7 +592,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set sai.end_time = null, sai.back_id = null, sai.status = '0', sai.update_time = CURRENT_TIMESTAMP where - bai.task_id = #{taskId} and sai.status = '1' + bai.task_id = #{preTaskId} and sai.status = '1' and sai.type_id = #{typeId}