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 ef9cde53..e2906c20 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 @@ -13,7 +13,6 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.domain.BmFileInfo; import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.repair.domain.*; -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.RepairTicketVo; @@ -55,9 +54,10 @@ public class RepairServiceImpl implements RepairService { private RepairAuditDetailsMapper repairAuditDetailsMapper; // 1:内部维修 2:外部返厂维修 3:报废 - private final int inRepairType = 1; // 需要严格匹配枚举值 RepairTypeEnum.INNER_REPAIR.getTypeId(); - private final int outRepairType = 2; // 需要严格匹配枚举值 RepairTypeEnum.RETURN_FACTORY.getTypeId(); - private final int scrapRepairType = 3; // 需要严格匹配枚举值 RepairTypeEnum.TO_SCRAP.getTypeId(); + private final int INNER_REPAIR = 1; // 需要严格匹配枚举值 RepairTypeEnum.INNER_REPAIR.getTypeId(); + private final int RETURN_FACTORY = 2; // 需要严格匹配枚举值 RepairTypeEnum.RETURN_FACTORY.getTypeId(); + private final int TO_SCRAP = 3; // 需要严格匹配枚举值 RepairTypeEnum.TO_SCRAP.getTypeId(); + @Override public List getRepairTaskList(RepairTask bean) { return repairMapper.getRepairTaskList(bean); @@ -254,19 +254,19 @@ public class RepairServiceImpl implements RepairService { // 根据维修类型,更新维修数量、报废数量 switch (bean.getRepairType()) { - case inRepairType: { + case INNER_REPAIR: { int repairNum = verifyRepairNum(bean, details); // 更新维修数量、并修改维修人员 repairMapper.updateRepairedNum(bean.getId(), repairNum, loginUser.getUserid(), loginUser.getUserid()); break; } - case outRepairType: { + case RETURN_FACTORY: { int repairNum = verifyRepairNum(bean, details); // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); break; } - case scrapRepairType: { + case TO_SCRAP: { int scrapNum = details.getScrapNum() + bean.getScrapNum(); int num = scrapNum + details.getRepairedNum(); if (num > details.getRepairNum()) { @@ -422,19 +422,19 @@ public class RepairServiceImpl implements RepairService { } // 根据维修方式,更新维修数量、报废数量 switch (bean.getRepairType()) { - case inRepairType: { + case INNER_REPAIR: { partList = bean.getCodeInRepairPartList(); // 更新维修数量、并修改维修人员 repairMapper.updateRepairedNumAndStatus(bean.getId(), 1, 1, loginUser.getUserid(), loginUser.getUserid()); break; } - case outRepairType: { + case RETURN_FACTORY: { partList = bean.getCodeOutRepairPartList(); // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwoAndStatus(bean.getId(), 1, 1, loginUser.getUserid()); break; } - case scrapRepairType: { + case TO_SCRAP: { // 报废无需上传配件、直接初始化空集合 partList = bean.getCodeScrapRepairPartList(); // 更新报废数量