diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 7f615c38..a6e5442f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -63,7 +63,7 @@ public class RepairServiceImpl implements RepairService { int repairNum = details.getRepairedNum() + bean.getRepairNum(); int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { - return AjaxResult.error("维修数量大于维修总量"); + throw new ServiceException("维修数量大于维修总量"); } mapper.updateRepairedNum(bean.getId(), repairNum,bean.getRepairer(),loginUser.getUserid()); break; @@ -72,7 +72,7 @@ public class RepairServiceImpl implements RepairService { int repairNum = details.getRepairedNum() + bean.getRepairNum(); int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { - return AjaxResult.error("维修数量大于维修总量"); + throw new ServiceException("维修数量大于维修总量"); } mapper.updateRepairedNumTwo(bean.getId(), repairNum,loginUser.getUserid()); break; @@ -81,7 +81,7 @@ public class RepairServiceImpl implements RepairService { int scrapNum = details.getScrapNum() + bean.getScrapNum(); int num = scrapNum + details.getRepairedNum(); if (num > details.getRepairNum()) { - return AjaxResult.error("维修数量大于维修总量"); + throw new ServiceException("维修数量大于维修总量"); //添加维修记录 } mapper.updateScrapNum(bean.getId(), scrapNum,loginUser.getUserid()); @@ -130,7 +130,7 @@ public class RepairServiceImpl implements RepairService { for (RepairTaskDetails bean : list){ int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); if (repairedNum <= 0){ - return AjaxResult.error("选中的数据中包含待维修数量为0的机具,请重新选择"); + throw new ServiceException("选中的数据中包含待维修数量为0的机具,请重新选择"); } } for (RepairTaskDetails bean : list){ @@ -157,7 +157,7 @@ public class RepairServiceImpl implements RepairService { for (RepairTask task : taskList){ int i = mapper.getUnFinish(task); if (i > 0){ - return AjaxResult.error("选中的数据中包含维修未完成的,请完成维修再进行提交审核"); + throw new ServiceException("选中的数据中包含维修未完成的,请完成维修再进行提交审核"); } } int i = mapper.updateTaskStatus(taskList,loginUser.getUserid()); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml index 52e6eb77..d5eb69b2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml @@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tk.code = #{backCode} + order by tk.create_time desc