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/mapper/xml/DailyMaintenanceOrderMapper.xml | 5 ++++- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java | 12 +++++++++++- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java | 3 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java | 6 ++++++ 4 files changed, 24 insertions(+), 2 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); diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java index 2672f9b..511a059 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java @@ -137,6 +137,12 @@ @ApiModelProperty(value = "3淇濋獙鏀跺崟妫�鏌ユ椂闂�") private Date inspectDate; + @ApiModelProperty(value = "3淇濋獙鏀舵湭閫氳繃鍘熷洜") + private String notPassReason; + + @ApiModelProperty(value = "涓夌骇淇濆吇楠屾敹鐘舵�侊紙1閫氳繃锛�2鏈�氳繃锛�") + private String checkStatus; + @TableField(exist = false) private List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails; } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java index 18d2ff8..8111a3d 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java @@ -68,4 +68,7 @@ @TableField(exist = false) private String maintenanceOrderId; + + @TableField(exist = false) + private String notPassReason; } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml index fc79d81..a3ce6b7 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml @@ -81,7 +81,9 @@ t1.precision_inspection_status as precisionInspectionStatus, t1.stove_exempt_status as stoveExemptStatus, t1.inspect_user as inspectUser, - t1.inspect_date as inspectDate + t1.inspect_date as inspectDate, + t12.item_text as checkStatusName, + t1.not_pass_reason as notPassReason FROM mom_eam_daily_maintenance_order t1 LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id @@ -94,6 +96,7 @@ left join sys_user t8 on t1.maintenance_user_id = t8.id left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type + left join (SELECT * FROM v_sys_dict WHERE dict_code = 'check_status') t12 on t12.item_value = t1.check_status WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType} <if test="params.num != null and params.num != ''"> and t1.num like concat('%',#{params.num},'%') -- Gitblit v1.9.3