增加预定人显示

ruoyi-api/ruoyi-api-server/src/main/java/org/dromara/server/api/RemoteServerService.java

@@ -26,4 +26,13 @@ public interface RemoteServerService {
      */
     RemoteUser getUserByPhone(String tenantId, String phone);
 
+
+    /**
+     * 根据personCode查询用户昵称
+     *
+     * @param personCode personCode
+     * @return 用户昵称
+     */
+    String selectNiceNameByPersonCodes(String personCode);
+
 }

ruoyi-common/ruoyi-common-translation/pom.xml

@@ -37,6 +37,11 @@
             <artifactId>ruoyi-api-resource</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api-server</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java

@@ -33,4 +33,9 @@ public interface TransConstant {
      */
     String OSS_ID_TO_URL = "oss_id_to_url";
 
+    /**
+     * 云上code转用户昵称
+     */
+    String PERSON_CODE_TO_NICKNAME = "person_code_to_nickname";
+
 }

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/PersonCodeTranslationImpl.java

+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.server.api.RemoteServerService;
+
+/**
+ * 用户名翻译实现
+ *
+ * @author Lion Li
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.PERSON_CODE_TO_NICKNAME)
+public class PersonCodeTranslationImpl implements TranslationInterface<String> {
+
+    @DubboReference
+    private RemoteServerService remoteServerService;
+
+    @Override
+    public String translation(Object key, String other) {
+        return remoteServerService.selectNiceNameByPersonCodes(key.toString());
+    }
+}

ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -4,3 +4,4 @@ org.dromara.common.translation.core.impl.DictTypeTranslationImpl
 org.dromara.common.translation.core.impl.OssUrlTranslationImpl
 org.dromara.common.translation.core.impl.UserNameTranslationImpl
 org.dromara.common.translation.core.impl.NicknameTranslationImpl
+org.dromara.common.translation.core.impl.PersonCodeTranslationImpl

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderAirportChangeVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderAirportChange;
 
 import java.io.Serial;
@@ -38,6 +40,9 @@ public class OrderAirportChangeVo implements Serializable {
     @ExcelProperty(value = "人员code")
     private String personCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "personCode")
+    private String personCodeNickName;
+
     /**
      * 改签编号
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderAirportRefundVo.java

@@ -6,6 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderAirportRefund;
 
 import java.io.Serial;
@@ -39,6 +41,9 @@ public class OrderAirportRefundVo implements Serializable {
     @ExcelProperty(value = "人员code")
     private String personCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "personCode")
+    private String personCodeNickName;
+
     /**
      * 退票单号
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderAirportVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderAirport;
 
 import java.io.Serial;
@@ -36,6 +38,9 @@ public class OrderAirportVo implements Serializable {
      */
     private String applyCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "applyCode")
+    private String applyCodeNickName;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderHotelVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderHotel;
 
 import java.io.Serial;
@@ -36,6 +38,9 @@ public class OrderHotelVo implements Serializable {
      */
     private String applyCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "applyCode")
+    private String applyCodeNickName;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderTrainChangeVo.java

@@ -6,6 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderTrainChange;
 
 import java.io.Serial;
@@ -40,6 +42,9 @@ public class OrderTrainChangeVo implements Serializable {
     @ExcelProperty(value = "人员code")
     private String personCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "personCode")
+    private String personCodeNickName;
+
     /**
      * 改签编号
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderTrainRefundVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderTrainRefund;
 
 import java.io.Serial;
@@ -37,6 +39,9 @@ public class OrderTrainRefundVo implements Serializable {
     @ExcelProperty(value = "人员code")
     private String personCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "personCode")
+    private String personCodeNickName;
+
     /**
      * 退票单号
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderTrainVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderTrain;
 
 import java.io.Serial;
@@ -37,6 +39,9 @@ public class OrderTrainVo implements Serializable {
      */
     private String applyCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "applyCode")
+    private String applyCodeNickName;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderVehiclesVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.server.domain.OrderVehicles;
 
 import java.io.Serial;
@@ -35,6 +37,9 @@ public class OrderVehiclesVo implements Serializable {
      */
     private String applyCode;
 
+    @Translation(type = TransConstant.PERSON_CODE_TO_NICKNAME, mapper = "applyCode")
+    private String applyCodeNickName;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteServerServiceImpl.java

 package org.dromara.server.dubbo;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.ys.config.Config;
 import org.dromara.common.ys.constant.Status;
 import org.dromara.common.ys.model.req.org.EditEmployeeModel;
@@ -13,8 +16,11 @@ import org.dromara.server.api.RemoteServerService;
 import org.dromara.server.api.domain.RemoteUser;
 import org.dromara.server.domain.BizUser;
 import org.dromara.server.mapper.BizUserMapper;
+import org.dromara.system.api.RemoteUserService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -29,6 +35,7 @@ public class RemoteServerServiceImpl implements RemoteServerService {
 
     private final BizUserMapper userMapper;
     private final IOrgService orgService;
+    private final RemoteUserService remoteUserService;
 
     @GlobalTransactional(timeoutMills = 60000, rollbackFor = Exception.class)
     @Override
@@ -67,4 +74,18 @@ public class RemoteServerServiceImpl implements RemoteServerService {
         String userNo = tenantId + "-" + phone;
         return BeanUtil.copyProperties(userMapper.selectOne(new LambdaQueryWrapper<>(BizUser.class).eq(BizUser::getUserNo, userNo)), RemoteUser.class);
     }
+
+    @Override
+    public String selectNiceNameByPersonCodes(String personCode) {
+        List<String> list = new ArrayList<>();
+        for (String userNo : StringUtils.splitTo(personCode, Convert::toStr)) {
+            BizUser user = userMapper.selectOne(BizUser::getUserNo, userNo);
+            if (ObjectUtil.isNotNull(user)) {
+                list.add(remoteUserService.selectNicknameById(user.getSystemUserId()));
+            } else {
+                list.add(userNo);
+            }
+        }
+        return String.join(StringUtils.SEPARATOR, list);
+    }
 }