lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -643,24 +643,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("报工失败!"); @@ -675,10 +674,15 @@ 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); FinishTransferOrder finishTransferOrder = new FinishTransferOrder(); lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -595,6 +595,7 @@ // isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId()); isd.setMaintenanceMode(maintenanceStandardDetail.getMaintenanceMode()); isd.setMaintenanceRequire(maintenanceStandardDetail.getMaintenanceRequire()); isd.setMaintenanceRole(maintenanceStandardDetail.getMaintenanceRole()); if(maintenanceCycle.size() > 0){ isd.setMaintenanceCycleId(maintenanceCycle.get(0).getValue()); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -9,6 +9,7 @@ t1.location, t1.photo, t1.maintenance_project_id as maintenanceProjectId, t5.item_text as maintenanceRole, t3.num as maintenanceProjectNum, t3.name as maintenanceProjectName, t3.standard, @@ -19,6 +20,7 @@ LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id LEFT JOIN mom_eam_maintenance_project t3 ON t1.maintenance_project_id = t3.id LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t5 ON t5.item_value = t1.maintenance_role where t1.del_flag = '0' and t2.del_flag = '0' and t3.del_flag = '0' and t2.type = 'daily' <if test="maintenanceStandardId != null and maintenanceStandardId != ''"> and t2.id = #{maintenanceStandardId} @@ -74,7 +76,7 @@ t1.plan_end_time as planEndTime, t1.actual_start_time as actualStartTime, t1.actual_end_time as actualEndTime, t8.realname as maintenanceUserName, t1.maintenance_user_id as maintenanceUserId, t9.item_text as assignModeName, t1.create_by as createBy, t1.create_time as createTime, @@ -95,7 +97,6 @@ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status left join sys_depart t6 on t3.use_id = t6.id left join mom_base_team t7 on t7.id = t3.team_id 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 sys_file_name t12 on t1.maintenance_order_uda3 = t12.id @@ -143,7 +144,7 @@ t1.plan_end_time as planEndTime, t1.actual_start_time as actualStartTime, t1.actual_end_time as actualEndTime, t8.realname as maintenanceUserName, t1.maintenance_user_id as maintenanceUserId, t9.item_text as assignModeName, t1.create_by as createBy, t1.create_time as createTime, @@ -170,7 +171,6 @@ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status left join sys_depart t6 on t3.use_id = t6.id left join mom_base_team t7 on t7.id = t3.team_id 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
