From 8aa91092ad0a706845a0ec9ce39b4c5925e087c0 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Thu, 28 Mar 2024 14:59:06 +0800 Subject: [PATCH] =?UTF-8?q?#=E7=94=A8=E6=88=B7=E5=B1=95=E7=A4=BA=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/alarm/show/wrapper/HandleWrapper.java | 3 +-- .../inspect/offline/wrapper/OfflineRecordWrapper.java | 4 ++-- .../hzinfo/inspect/task/entity/InspectionTaskSMS.java | 2 +- .../inspect/task/service/impl/TaskServiceImpl.java | 2 +- .../com/hnac/hzims/message/fegin/MessageClient.java | 2 +- .../hzims/message/wrapper/MsgPushRecordWrapper.java | 4 ++-- .../hzims/message/wrapper/MsgSmsRecordWrapper.java | 4 ++-- .../message/wrapper/MsgWsRecordHistoryWrapper.java | 4 ++-- .../hnac/hzims/message/wrapper/MsgWsRecordWrapper.java | 4 ++-- .../hzims/operational/access/excel/BaseExport.java | 2 +- .../access/service/impl/AccessPlanV4ServiceImpl.java | 12 ++++++------ .../access/service/impl/AccessTaskV4ServiceImpl.java | 8 ++++---- .../service/impl/OperAccessStatisticsServiceImpl.java | 10 +++++----- .../access/service/impl/OperAccessTaskServiceImpl.java | 10 +++++----- .../operational/config/wrapper/AreaMapWrapper.java | 2 +- .../defect/service/impl/DefectCheckServiceImpl.java | 4 ++-- .../operational/defect/wrapper/OperDefectWrapper.java | 4 ++-- .../operational/defect/wrapper/OperFaultWrapper.java | 4 ++-- .../defect/wrapper/OperPhenomenonWrapper.java | 12 ++++++------ .../duty/service/impl/ImsDutyMainServiceImpl.java | 16 ++++++++-------- .../operational/fill/wrapper/GenerateWrapper.java | 2 +- .../hzims/operational/fill/wrapper/OtherWrapper.java | 2 +- .../operational/fill/wrapper/OverConfigWrapper.java | 2 +- .../operational/fill/wrapper/OverDetailsWrapper.java | 2 +- .../hzims/operational/fill/wrapper/OverWrapper.java | 2 +- .../hzims/operational/fill/wrapper/PowerWrapper.java | 2 +- .../operational/fill/wrapper/RainfallWrapper.java | 2 +- .../hzims/operational/fill/wrapper/SolveWrapper.java | 2 +- .../hzims/operational/fill/wrapper/StorageWrapper.java | 2 +- .../hzims/operational/fill/wrapper/UseWrapper.java | 2 +- .../hzims/operational/fill/wrapper/WindWrapper.java | 2 +- .../main/service/impl/HydropowerServiceImpl.java | 4 ++-- .../main/service/impl/WindHomeServiceImpl.java | 4 ++-- .../controller/OperMaintenancePlanController.java | 10 +++++----- .../service/impl/MaintenanceServiceImpl.java | 4 ++-- .../report/schedule/OperPersonalCreateMonthReport.java | 2 +- .../impl/OperStationMonthReportServiceImpl.java | 2 +- .../service/impl/DistributeWorkOrderServiceImpl.java | 2 +- .../service/impl/TicketProcessServiceImpl.java | 12 ++++++------ .../service/impl/WorkTicketInfoServiceImpl.java | 18 +++++++++--------- 40 files changed, 96 insertions(+), 97 deletions(-) diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java index 990af3c..4301ec9 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java @@ -21,8 +21,7 @@ public class HandleWrapper extends BaseEntityWrapper imp taskReportVO.setCompleteSituation(finishSituation); taskReportVO.setIncompleteNum(list.stream().filter(taskCountVO -> Func.isNotEmpty(taskCountVO.getUndoneTask())).collect(Collectors.summingInt(TaskCountVO::getUndoneTask))); taskReportVO.setIncompleteSituation(undoSituation); - taskReportVO.setUserName(user.getName()); + taskReportVO.setUserName(user.getRealName()); result.add(taskReportVO); } }); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java index 8918d39..17a5914 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java @@ -187,7 +187,7 @@ public class MessageClient extends BladeController implements IMessageClient{ if (ObjectUtil.isEmpty(user)||ObjectUtil.isEmpty(user.getPhone())){ continue; } - record.setPusherName(user.getName()); + record.setPusherName(user.getRealName()); record.setPusher(pushId.toString()); record.setPushType(MessageConstants.IMMEDIATELY); record.setDeptName(Func.isNotEmpty(record.getDeptName()) ? record.getDeptName() : this.getDeptNameById(record.getDeptId())); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java index 79b0509..0f9c31c 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/wrapper/MsgPushRecordWrapper.java @@ -24,8 +24,8 @@ public class MsgPushRecordWrapper extends BaseEntityWrapper materialEntityList = JSONObject.parseArray(JSON.toJSONString(entity.getAccessMaterials()), OperAccessMaterialEntity.class); if (ObjectUtil.isNotEmpty(entity.getHandler())){ User user = UserCache.getUser(entity.getHandler()); - if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){ - entity.setHandlerName(user.getName()); - entity.setCreateUserName(user.getName()); - entity.setUpdateUserName(user.getName()); + if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){ + entity.setHandlerName(user.getRealName()); + entity.setCreateUserName(user.getRealName()); + entity.setUpdateUserName(user.getRealName()); } } taskService.save(entity); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java index 15e1726..a2ca293 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java @@ -46,14 +46,14 @@ public class OperAccessStatisticsServiceImpl extends BaseServiceImpl materialEntityList = JSONObject.parseArray(JSON.toJSONString(req.getAccessMaterials()), OperAccessMaterialEntity.class); if (super.save(req)) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/wrapper/AreaMapWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/wrapper/AreaMapWrapper.java index d7f01b9..a869d0d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/wrapper/AreaMapWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/wrapper/AreaMapWrapper.java @@ -26,7 +26,7 @@ public class AreaMapWrapper extends BaseEntityWrapper return vo; } assert vo != null; - vo.setUserName(createUser.getName()); + vo.setUserName(createUser.getRealName()); return vo; } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java index 7293ec0..31a0061 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java @@ -101,8 +101,8 @@ public class DefectCheckServiceImpl extends BaseServiceImpllambdaUpdate() .eq(OperPhenomenonEntity::getDefectCode,entity.getDefectCode()).last("limit 1")); if(Func.isNotEmpty(phenomenonEntity)){ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java index 08bb511..0bd21e1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperFaultWrapper.java @@ -40,8 +40,8 @@ public class OperFaultWrapper extends BaseEntityWrapper { return vo; } assert vo != null; - vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null)); + vo.setUserName(createUser.getRealName()); vo.setAscriptionUser(entity.getCreateUser()); return vo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java index 74d057c..5318d67 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/OverConfigWrapper.java @@ -25,7 +25,7 @@ public class OverConfigWrapper extends BaseEntityWrapper { return vo; } assert vo != null; - vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null)); + vo.setUserName(createUser.getRealName()); vo.setAscriptionUser(entity.getCreateUser()); return vo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java index 878b4a8..f92102b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/PowerWrapper.java @@ -25,7 +25,7 @@ public class PowerWrapper extends BaseEntityWrapper { return vo; } assert vo != null; - vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null)); + vo.setUserName(createUser.getRealName()); vo.setAscriptionUser(entity.getCreateUser()); return vo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java index fea7831..87b2b13 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/RainfallWrapper.java @@ -29,7 +29,7 @@ public class RainfallWrapper extends BaseEntityWrapper { return vo; } assert vo != null; - vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null)); + vo.setUserName(createUser.getRealName()); vo.setAscriptionUser(entity.getCreateUser()); return vo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java index d01f7a5..81a28dc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/StorageWrapper.java @@ -29,7 +29,7 @@ public class StorageWrapper extends BaseEntityWrapper return vo; } assert vo != null; - vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null)); + vo.setUserName(createUser.getRealName()); return vo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java index d8f53b6..e08cc06 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/UseWrapper.java @@ -29,7 +29,7 @@ public class UseWrapper extends BaseEntityWrapper { return vo; } assert vo != null; - vo.setUserName(Optional.ofNullable(createUser.getName()).orElse(null)); + vo.setUserName(createUser.getRealName()); return vo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java index ab8609e..b16a483 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/wrapper/WindWrapper.java @@ -25,7 +25,7 @@ public class WindWrapper extends BaseEntityWrapper { return vo; } assert vo != null; - vo.setUserName(createUser.getName()); + vo.setUserName(createUser.getRealName()); return vo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index e4a04b0..ea0ab34 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -1860,7 +1860,7 @@ public class HydropowerServiceImpl implements HydropowerService { if (ObjectUtil.isEmpty(user)) { return ""; } - return user.getName(); + return user.getRealName(); } /** @@ -1883,7 +1883,7 @@ public class HydropowerServiceImpl implements HydropowerService { if (ObjectUtil.isEmpty(user)) { continue; } - builder.append(user.getName()).append(","); + builder.append(user.getRealName()).append(","); } if(builder.length() <= 0){ return ""; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java index 150bf65..1eb945f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java @@ -721,7 +721,7 @@ public class WindHomeServiceImpl implements WindHomeService { if (ObjectUtil.isEmpty(user)) { return ""; } - return user.getName(); + return user.getRealName(); } /** @@ -744,7 +744,7 @@ public class WindHomeServiceImpl implements WindHomeService { if (ObjectUtil.isEmpty(user)) { continue; } - builder.append(user.getName()).append(","); + builder.append(user.getRealName()).append(","); } if(builder.length() <= 0){ return ""; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java index de37b9c..07de95b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java @@ -67,14 +67,14 @@ public class OperMaintenancePlanController extends BladeController { req.setTaskType("1"); if (ObjectUtil.isNotEmpty(req.getDisposer())){ User user = UserCache.getUser(req.getDisposer()); - if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getName())){ - req.setDisposerName(user.getName()); + if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){ + req.setDisposerName(user.getRealName()); } } BladeUser user = AuthUtil.getUser(); - if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getUserName())){ - req.setCreateUserName(user.getUserName()); - req.setUpdateUserName(user.getUserName()); + if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getNickName())){ + req.setCreateUserName(user.getNickName()); + req.setUpdateUserName(user.getNickName()); } planService.save(req); return R.data(req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java index a540cf2..2fb3d98 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java @@ -348,8 +348,8 @@ public class MaintenanceServiceImpl implements MaintenanceService { String disposerName=""; for (int i = 0; i < split.length; i++) { User user = UserCache.getUser(Long.valueOf(split[i])); - if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getName())){ - disposerName=disposerName+user.getName(); + if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getRealName())){ + disposerName=disposerName+user.getRealName(); } } taskEntity.setDisposer(userId.replaceAll("\\^", ",")); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/schedule/OperPersonalCreateMonthReport.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/schedule/OperPersonalCreateMonthReport.java index d8f3e92..85b50b5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/schedule/OperPersonalCreateMonthReport.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/schedule/OperPersonalCreateMonthReport.java @@ -75,7 +75,7 @@ public class OperPersonalCreateMonthReport { } } else{ - log.info("{}已生成月报",user.getName()); + log.info("{}已生成月报",user.getRealName()); } } }); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java index 582c811..1648d61 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java @@ -554,7 +554,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor List userListByRoleAlias = userClient.relationUserListByRoleAlias("200000", deptId, PROJECT_MANAGER).getData(); if (CollectionUtil.isNotEmpty(userListByRoleAlias)){ User user = userListByRoleAlias.get(0); - map.put("manager", user.getName()); + map.put("manager", user.getRealName()); }else { map.put("manager",""); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java index 059bdec..98f7dc6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java @@ -82,7 +82,7 @@ public class DistributeWorkOrderServiceImpl implements IDistributeWorkOrderServi publisher.setContactAddress("123123"); publisher.setContactName("123123"); publisher.setContactPhone(user.getPhone()); - publisher.setPublisher(user.getName()); + publisher.setPublisher(user.getRealName()); publisher.setPublisherScale("123123"); orderPackageDto.setPublisher(publisher); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index b200f66..7f31e8e 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -411,9 +411,9 @@ public class TicketProcessServiceImpl implements TicketProcessService { log.info("工作票负责人更新变更"); workTicketPrincipalChangeService.updateByTicketId(workTicketPrincipalChange); } - log.info("工作负责人变更 原来的负责人 {}，变更为 {}", user.getName(), newUser.getName()); + log.info("工作负责人变更 原来的负责人 {}，变更为 {}", user.getRealName(), newUser.getRealName()); workTicket.setPrincipal(workTicketPrincipalChange.getChangePrincipal()); - workTicket.setPrincipalName(newUser.getName()); + workTicket.setPrincipalName(newUser.getRealName()); //更新工作票 workTicketInfoService.updateById(workTicket); } @@ -591,8 +591,8 @@ public class TicketProcessServiceImpl implements TicketProcessService { //下一个审批人 User stepUser = UserCache.getUser(taskUser); if (stepUser != null) { - flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(stepUser.getName()).concat("审批"); - workTicket.setNextStepOperator(stepUser.getName()); + flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(stepUser.getRealName()).concat("审批"); + workTicket.setNextStepOperator(stepUser.getRealName()); } } else { workTicket.setNextStepOperator(null); @@ -855,7 +855,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { Long principal = workTicket.getPrincipal(); if (ObjectUtils.isNotEmpty(principal)) { User user = UserCache.getUser(principal); - return user == null ? null : user.getName(); + return user == null ? null : user.getRealName(); } return workTicket.getPrincipalManual(); } @@ -872,7 +872,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { String[] splits = classGroupMembers.split(","); for (String split : splits) { User user = UserCache.getUser(Long.valueOf(split)); - stringJoiner.add(user != null ? user.getName() : ""); + stringJoiner.add(user != null ? user.getRealName() : ""); } } String classGroupMembersManual = workTicket.getClassGroupMembersManual(); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index f9df574..5cdbb0b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java @@ -275,7 +275,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl { User user = UserCache.getUser(item.getCreateUser()); if (user != null) { - item.setCreateUserName(user.getName()); + item.setCreateUserName(user.getRealName()); } }); @@ -978,23 +978,23 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl