From a5b427bc39acc0cea80e3ca44d5744968778bc74 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期二, 12 十二月 2023 15:25:13 +0800 Subject: [PATCH] 维修履历 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java index 5e968fc..aa77ba7 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java @@ -1547,6 +1547,15 @@ @PutMapping(value = "/report") @Transactional(rollbackFor = {Exception.class}) public Result<?> orderReport(@RequestBody RepairOrder repairOrder){ + String id = repairOrder.getId(); + List<RepairOrderActualWorkHours> hoursList = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0)); + List<RepairOrderActualWorkHours> mainStuff = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0).eq("principal_contractor","1")); + if(hoursList.size()<2){ + return Result.error("鎿嶄綔澶辫触锛岃鑷冲皯娣诲姞涓や釜鎵夸慨浜�"); + } + if(mainStuff.size()!=1){ + return Result.error("鎿嶄綔澶辫触锛岃娣诲姞涓绘壙淇汉锛屾湁涓斿彧鏈変竴涓�"); + } if(StringUtils.isNotBlank(repairOrder.getProjectMaintenanceOrderId())){ //鍒ゆ柇椤圭洰鎬х淮淇瓙琛ㄧ姸鎬� ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder.getProjectMaintenanceOrderId()); @@ -1587,7 +1596,7 @@ repairOrder.setStatus("4"); repairOrder.setActualEndTime(now); repairOrder.setActualHour(hours); - repairOrder.setRecipientUserId(user.getId()); + repairOrder.setRecipientUserId(mainStuff.get(0).getUserId()); repairOrderService.updateById(repairOrder); if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId()); -- Gitblit v1.9.3