浙江医院质控整改

knowledgeman-service/src/main/java/com/diagbot/dto/RuleAppDTO.java

@@ -18,30 +18,35 @@ public class RuleAppDTO {
      */
     private Integer id;
 
-//    /**
-//     * 是否删除,N:未删除，Y:删除
-//     */
-//    private String isDeleted;
-//
-//    /**
-//     * 记录创建时间
-//     */
-//    private Date gmtCreate;
-//
+    //    /**
+    //     * 是否删除,N:未删除，Y:删除
+    //     */
+    //    private String isDeleted;
+    //
+    //    /**
+    //     * 记录创建时间
+    //     */
+    //    private Date gmtCreate;
+    //
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
     private Date gmtModified;
-//
-//    /**
-//     * 创建人，0表示无创建人值
-//     */
-//    private String creator;
-//
-//    /**
-//     * 修改人,如果为0则表示纪录未修改
-//     */
-//    private String modifier;
+    //
+    //    /**
+    //     * 创建人，0表示无创建人值
+    //     */
+    //    private String creator;
+    //
+    //    /**
+    //     * 修改人,如果为0则表示纪录未修改
+    //     */
+    //    private String modifier;
+
+    /**
+     * 操作人
+     */
+    private String operName;
 
     /**
      * 指标名称

knowledgeman-service/src/main/java/com/diagbot/facade/RuleAppFacade.java

@@ -3,6 +3,8 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RuleAppDTO;
 import com.diagbot.entity.RuleApp;
 import com.diagbot.enums.IsDeleteEnum;
@@ -14,16 +16,20 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.IntegerUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.RuleAppIdVO;
 import com.diagbot.vo.RuleAppPageVO;
 import com.diagbot.vo.RuleAppSaveVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -32,6 +38,8 @@ import java.util.List;
  */
 @Component
 public class RuleAppFacade extends RuleAppServiceImpl {
+    @Autowired
+    private UserServiceClient userServiceClient;
 
     public IPage<RuleAppDTO> pageRuleApp(RuleAppPageVO ruleAppPageVO) {
         IPage<RuleAppDTO> res = new Page<>(ruleAppPageVO.getCurrent(), ruleAppPageVO.getSize());
@@ -40,10 +48,15 @@ public class RuleAppFacade extends RuleAppServiceImpl {
         IPage<RuleApp> page = this.page(ruleAppPageVO, ruleAppQueryWrapper);
         BeanUtil.copyProperties(page, res);
         if (ListUtil.isNotEmpty(page.getRecords())) {
+            List<String> userIds = page.getRecords().stream()
+                    .map(i -> i.getModifier()).distinct().collect(Collectors.toList());
+            RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
+            RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
             List<RuleAppDTO> ruleAppDTOList = ListUtil.newArrayList();
             for (RuleApp ruleApp : page.getRecords()) {
                 RuleAppDTO ruleAppDTO = new RuleAppDTO();
                 BeanUtil.copyProperties(ruleApp, ruleAppDTO);
+                ruleAppDTO.setOperName(respDTO.data.get(ruleApp.getModifier()));
                 ruleAppDTO.setTypeIdName(RuleAppTypeEnum.getName(Integer.valueOf(ruleApp.getTypeId())));
                 ruleAppDTOList.add(ruleAppDTO);
             }