From f4d05cba0df916613df9aa7eba08f95498c78658 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 25 Nov 2024 10:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/controller/RepairController.java | 10 +++++----- .../com/bonus/material/repair/mapper/RepairMapper.java | 3 +-- .../bonus/material/repair/service/RepairService.java | 5 ++--- .../repair/service/impl/RepairServiceImpl.java | 7 +++---- .../resources/mapper/material/repair/RepairMapper.xml | 3 ++- 5 files changed, 13 insertions(+), 15 deletions(-) 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 d4399939..c0a75bb6 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 @@ -136,12 +136,12 @@ public class RepairController extends BaseController { } /** - * 维修明细--批量审核--更新明细status + * 维修明细--批量合格--更新明细status，以及repairedNum */ - @ApiOperation(value = "维修明细更新status--批量") - @PostMapping("/completeRepair") - public AjaxResult completeRepair(@RequestBody ArrayList ids) { - return toAjax(service.completeRepair(ids)); + @ApiOperation(value = "维修明细更新status--批量合格") + @PostMapping("/batchQualified") + public AjaxResult batchQualified(@RequestBody ArrayList ids) { + return toAjax(service.batchQualified(ids)); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java index a3eb3d59..18062f8f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java @@ -1,7 +1,6 @@ package com.bonus.material.repair.mapper; import com.bonus.material.repair.domain.*; -import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.domain.vo.RepairInputDetailsVo; import com.bonus.system.api.domain.SysUser; @@ -91,7 +90,7 @@ public interface RepairMapper { * @param ids 主键集合 * @param userId 用户id */ - int completeRepair(@Param("ids") ArrayList ids, @Param("userId") Long userId); + int batchQualified(@Param("ids") ArrayList ids, @Param("userId") Long userId); /** * 查询维修人员列表 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 bf773aff..28e9b47c 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 @@ -6,7 +6,6 @@ import com.bonus.material.repair.domain.RepairApplyRecord; import com.bonus.material.repair.domain.RepairInputDetails; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; -import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo; import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.domain.vo.RepairInputDetailsVo; @@ -59,9 +58,9 @@ public interface RepairService { AjaxResult batchRepairApply(@NotNull List repairDeviceVOList); /** - * 维修明细--批量审核--更新明细status + * 维修明细--批量合格--更新明细status，以及repairedNum */ - int completeRepair(ArrayList ids); + int batchQualified(ArrayList ids); /** * 查询维修人员列表 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 c87df283..a7a8c888 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 @@ -1,6 +1,5 @@ package com.bonus.material.repair.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.NumberUtil; import com.bonus.common.biz.enums.MaTypeManageTypeEnum; @@ -835,12 +834,12 @@ public class RepairServiceImpl implements RepairService { } /** - * 维修明细--批量审核--更新明细status + * 维修明细--批量合格--更新明细status，以及repairedNum */ @Override - public int completeRepair(ArrayList ids) { + public int batchQualified(ArrayList ids) { LoginUser loginUser = SecurityUtils.getLoginUser(); - return repairMapper.completeRepair(ids, loginUser.getUserid()); + return repairMapper.batchQualified(ids, loginUser.getUserid()); } @Override diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 6a0755a5..50fe7a6c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -86,9 +86,10 @@ where id = #{id} - + update repair_apply_details set status = '1', + repaired_num = repair_num, update_by = #{userId}, update_time = now() where id in