From 286375a43369462cd75147271949cf819916912f Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期五, 12 一月 2024 16:39:17 +0800 Subject: [PATCH] 问题项修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 69 ++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 12 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java index 682a7ce..f1f3bd7 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.eam.controller; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -111,6 +112,9 @@ private IMaintenanceStoveExemptService maintenanceStoveExemptService; @Autowired + private ITechnologyStatusService technologyStatusService; + + @Autowired private ISysFileNameService sysFileNameService; @Resource @@ -198,13 +202,17 @@ .eq(FinishTransferOrder::getEquipmentId, equipmentId).list(); for (FinishTransferOrder finishTransferOrder : finishTransferOrders) { String operateUser = finishTransferOrder.getOperateUser(); - record.put("operateUserName", operateUser); +// record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1()); + record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1())); String repairUser = finishTransferOrder.getRepairUser(); - record.put("repairUserName", repairUser); +// record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2()); + record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2())); String repairDirectorUser = finishTransferOrder.getRepairDirectorUser(); - record.put("repairDirectorUserName", repairDirectorUser); +// record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()); + record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3())); String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser(); - record.put("equipmentInspectorUserName", equipmentInspectorUser); +// record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()); + record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4())); } } @@ -305,6 +313,7 @@ dailyMaintenanceOrder.setConfirmStatus("0");//绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛� dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛� dailyMaintenanceOrder.setStoveExemptStatus("0");//鐐夌被璁惧璞佸厤20椤圭姸鎬侊紙0鏈‘璁わ紝1缁翠慨瀹や富浠伙紝2淇濆吇浜哄憳锛�3浠〃宸ワ級 + dailyMaintenanceOrder.setStatus("3");//3:鏈紑濮� dailyMaintenanceOrderService.save(dailyMaintenanceOrder); List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails(); for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) { @@ -602,6 +611,16 @@ maintenanceStoveExemptService.removeById(maintenanceStoveExempt); } + /** + * 鍒犻櫎绮惧害妫�楠屽崟 + */ + List<TechnologyStatus> technologyStatusList = technologyStatusService.lambdaQuery() + .eq(TechnologyStatus::getOrderId, id) + .eq(TechnologyStatus::getDelFlag, 0).list(); + for (TechnologyStatus technologyStatus : technologyStatusList) { + technologyStatusService.removeById(technologyStatus); + } + if (b) { return Result.OK("鎾ら攢鎴愬姛!"); } else { @@ -629,24 +648,23 @@ public Result<String> report(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); - dailyMaintenanceOrder.setMaintenanceUserId(userId); +// dailyMaintenanceOrder.setMaintenanceUserId(userId); dailyMaintenanceOrder.setActualEndTime(new Date()); boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder); + + List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails(); + for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) { + dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail); + } String id = dailyMaintenanceOrder.getId(); DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id); FinishTransferOrder finishTransferOrder = new FinishTransferOrder(); finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId()); finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId()); -// finishTransferOrder.setOperateUser(userId); -// finishTransferOrder.setRepairUser(userId); finishTransferOrder.setStatus("1"); finishTransferOrder.setDelFlag(0); finishTransferOrderService.save(finishTransferOrder); - -// this.createPrecisionInspection(maintenanceOrder); -// -// this.createMaintenanceStoveExempt(maintenanceOrder); if (!b) { return Result.error("鎶ュ伐澶辫触!"); @@ -661,9 +679,14 @@ public Result<String> report3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); - dailyMaintenanceOrder.setMaintenanceUserId(userId); +// dailyMaintenanceOrder.setMaintenanceUserId(userId); dailyMaintenanceOrder.setActualEndTime(new Date()); boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder); + + List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails(); + for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) { + dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail); + } String id = dailyMaintenanceOrder.getId(); DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id); @@ -675,6 +698,13 @@ finishTransferOrder.setStatus("1"); finishTransferOrder.setDelFlag(0); finishTransferOrderService.save(finishTransferOrder); + + String equipmentId = maintenanceOrder.getEquipmentId(); + Equipment equipment = equipmentService.getById(equipmentId); + String precisionParameters = equipment.getPrecisionParameters(); + if(!"1".equals(precisionParameters)){ + this.createTechnologyStatus(maintenanceOrder); + } this.createPrecisionInspection(maintenanceOrder); @@ -719,6 +749,14 @@ maintenanceStoveExemptService.save(maintenanceStoveExempt); } + void createTechnologyStatus(DailyMaintenanceOrder dailyMaintenanceOrder){ + List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("9"); + TechnologyStatus technologyStatus = new TechnologyStatus(); + technologyStatus.setOrderId(dailyMaintenanceOrder.getId()); + technologyStatus.setReceipts(sysFileName.get(0).getReceipts()); + technologyStatusService.save(technologyStatus); + } + /** * 鏃ュ父淇濆吇宸ュ崟 鑾峰彇璁惧鍙扮珯宸茬粦瀹氱殑瀵硅薄閮ㄩ棬 * qsw 2023-7-11 @@ -755,6 +793,7 @@ FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0); if("1".equals(confirmStatus)){ finishTransferOrder.setOperateUser(sysUser.getRealname()); + finishTransferOrder.setTransferOrderUda1(DateUtils.now()); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); @@ -766,6 +805,7 @@ finishTransferOrder.setRepairDirectorUser(""); finishTransferOrder.setRepairUser(""); finishTransferOrder.setOperateUser(""); + finishTransferOrder.setTransferOrderUda1(""); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); @@ -774,6 +814,7 @@ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟搷浣滀汉鍛�",maintenanceOrder.getNum()); }else if("3".equals(confirmStatus)){ finishTransferOrder.setRepairUser(sysUser.getRealname()); + finishTransferOrder.setTransferOrderUda2(DateUtils.now()); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); @@ -784,6 +825,7 @@ finishTransferOrder.setEquipmentInspectorUser(""); finishTransferOrder.setRepairDirectorUser(""); finishTransferOrder.setRepairUser(""); + finishTransferOrder.setTransferOrderUda2(""); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); @@ -792,6 +834,7 @@ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇汉鍛�",maintenanceOrder.getNum()); }else if("5".equals(confirmStatus)){ finishTransferOrder.setRepairDirectorUser(sysUser.getRealname()); + finishTransferOrder.setTransferOrderUda3(DateUtils.now()); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); @@ -800,6 +843,7 @@ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟楠屽憳",maintenanceOrder.getNum()); }else if("6".equals(confirmStatus)){ finishTransferOrder.setRepairDirectorUser(""); + finishTransferOrder.setTransferOrderUda3(""); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); @@ -808,6 +852,7 @@ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇涓讳换",maintenanceOrder.getNum()); }else if("7".equals(confirmStatus)){ finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname()); + finishTransferOrder.setTransferOrderUda4(DateUtils.now()); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); -- Gitblit v1.9.3