From 7cc3ac34f175e2dacc76a02fb66ae3ba9f747b55 Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期二, 11 三月 2025 08:14:20 +0800 Subject: [PATCH] 调整 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java index 1058f6d..4b388cb 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java @@ -16,11 +16,8 @@ import org.dromara.eims.domain.*; import org.dromara.eims.domain.bo.EimsMaintPlanBo; import org.dromara.eims.domain.vo.EimsMaintPlanVo; -import org.dromara.eims.domain.vo.EimsMaintStandVo; import org.dromara.eims.mapper.EimsMaintOrderMapper; -import org.dromara.eims.mapper.EimsMaintOrditmMapper; import org.dromara.eims.mapper.EimsMaintPlanMapper; -import org.dromara.eims.mapper.EimsMaintStandMapper; import org.dromara.eims.service.IEimsMaintOrderService; import org.dromara.eims.service.IEimsMaintPlanService; import org.dromara.eims.service.IGenerateCodeService; @@ -38,9 +35,7 @@ public class MaintPlanToOrderJob { private final EimsMaintOrderMapper orderMapper; - private final EimsMaintStandMapper standMapper; - private final EimsMaintOrditmMapper orditmMapper; private final EimsMaintPlanMapper planMapper; @@ -110,6 +105,7 @@ order.setId(null); order.setStatus(DictConstants.MAINT_ORDER_STATUS_DETAIL.DAIBAOYANG); order.setPlanTime(createOrderTime); + order.setPlanId(planVo.getId()); order.setMaintCode(codeService.generateCode("BYZD")); EimsMaintPlan plan = MapstructUtils.convert(planVo, EimsMaintPlan.class); assert plan != null; @@ -121,21 +117,9 @@ if (!flag) continue; planMapper.updateById(plan); - //鐢熸垚淇濆吇鏄庣粏 - Long equId = plan.getEquId(); - List<EimsMaintStandVo> standList = standMapper.selectVoList(new LambdaQueryWrapper<EimsMaintStand>().eq(EimsMaintStand::getEquId, equId)); - //TODO 娌℃湁淇濆吇椤癸紝娣诲姞寮傚父璁板綍 - if(standList.isEmpty()) continue; - for (int j = 0; j < standList.size(); j++) { - EimsMaintStandVo stand = standList.get(j); - EimsMaintOrditm itm = new EimsMaintOrditm(); - itm.setOrderId(order.getId()); - itm.setEquId(equId); - itm.setItmName(stand.getName()); - itm.setItmAction(stand.getStand()); - itm.setItmUser(order.getMaintUser()); - orditmMapper.insert(itm); - } + + + } return ExecuteResult.success("淇濆吇璁″垝鐢熸垚淇濆吇宸ュ崟鎴愬姛"); } -- Gitblit v1.9.3