From 665bf2329ab0c0dccf110ef06fc598fe112b535c Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 25 十月 2023 17:05:37 +0800 Subject: [PATCH] 验收单修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java index fe37c56..6af60f0 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java @@ -96,12 +96,22 @@ String userId = sysUser.getId(); String maintenanceOrderId = maintenanceThreeAcceptance.getMaintenanceOrderId(); List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances = maintenanceThreeAcceptance.getMaintenanceThreeAcceptances(); + String checkStatus = "1";//涓夌骇淇濆吇楠屾敹鐘舵�侊紙1閫氳繃锛�2鏈�氳繃锛� for (MaintenanceThreeAcceptance threeAcceptance : maintenanceThreeAcceptances) { - threeAcceptance.setId(""); +// threeAcceptance.setId(""); maintenanceThreeAcceptanceService.saveOrUpdate(threeAcceptance); + + String firstInspect = threeAcceptance.getFirstInspect(); + String secondInspect = threeAcceptance.getSecondInspect(); + if("2".equals(firstInspect) || "2".equals(secondInspect)){ + checkStatus = "2"; + } + } DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(maintenanceOrderId); maintenanceOrder.setInspectUser(sysUser.getRealname()); + maintenanceOrder.setNotPassReason(maintenanceThreeAcceptance.getNotPassReason()); + maintenanceOrder.setCheckStatus(checkStatus); maintenanceOrder.setInspectDate(new Date()); // maintenanceOrder.setStatus("8"); dailyMaintenanceOrderService.updateById(maintenanceOrder); -- Gitblit v1.9.3