设备台账表设备管理员字段调整（已去掉WK前缀），去掉消息推送逻辑中截取WK前缀的操作

cuilei

4 天以前 5739e2493dddb671a11869a1c11ea57949319263

设备台账表设备管理员字段调整（已去掉WK前缀），去掉消息推送逻辑中截取WK前缀的操作

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java

@@ -449,11 +449,7 @@
                        values.put("dataId", eamRepairOrder.getId());
                        values.put("organization", "维修工单进入等备件状态");
                        values.put("comment", "维修工单进入等备件状态");
                        //values.put("NextAssignee", equipment.getEquipmentManager().split(","));
                        //设备台账表维护的设备管理员工号是带 WK前缀的
                        values.put("NextAssignee", Arrays.stream(equipment.getEquipmentManager().split(","))
                                .map(s -> s.substring(2))
                                .collect(Collectors.toList()));
                        values.put("NextAssignee", equipment.getEquipmentManager().split(","));
                        values.put("status", 1);
                        request.setComment("维修工单进入等备件状态");
                        eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java

@@ -562,7 +562,7 @@
                }
                //班组长确认
                userApprovalList = new ArrayList<>();
                userApprovalList.add(equipment.getEquipmentManager().substring(2));//设备台账表维护的设备管理员工号是带 WK前缀的
                userApprovalList.add(equipment.getEquipmentManager());
                values.put("dataId", entity.getId());
                values.put("organization", request.getConfirmComment());
                values.put("comment", request.getConfirmComment());