化验公表项映射

icssman-service/src/main/java/com/diagbot/entity/LisMapping.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class LisMapping implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -79,18 +80,18 @@ public class LisMapping implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

icssman-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -1,8 +1,19 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.LisMappingPageDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.service.impl.LisMappingServiceImpl;
+import com.diagbot.vo.LisMappingPageVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * @Description:化验项目公表映射业务层
  * @Author:zhaops
@@ -10,5 +21,27 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class LisMappingFacade extends LisMappingServiceImpl {
+    @Autowired
+    private UserServiceClient userServiceClient;
 
+    /**
+     * 化验公表映射分页信息
+     *
+     * @param lisMappingPageVO
+     * @return
+     */
+    public IPage<LisMappingPageDTO> getLisMappingPage(LisMappingPageVO lisMappingPageVO) {
+        IPage<LisMappingPageDTO> dtoPage = this.lisMappingPage(lisMappingPageVO);
+        List<LisMappingPageDTO> records = dtoPage.getRecords();
+        List<String> userIds = records.stream().map(record -> record.getModifier()).collect(Collectors.toList());
+        RespDTO<Map<String, String>> data = userServiceClient.getUserInfoByIds(userIds);
+        Map<String, String> userInfos = data.data;
+        for (LisMappingPageDTO record : records) {
+            record.setGmtOperate(record.getGmtModified());
+            record.setOperator(record.getModifier());
+            record.setOperatorName(userInfos.get(record.getModifier()));
+        }
+        dtoPage.setRecords(records);
+        return dtoPage;
+    }
 }

icssman-service/src/main/java/com/diagbot/mapper/LisMappingMapper.java

@@ -1,6 +1,7 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.LisMappingPageDTO;
 import com.diagbot.entity.LisMapping;
@@ -23,5 +24,5 @@ public interface LisMappingMapper extends BaseMapper<LisMapping> {
      * @param lisMappingPageVO
      * @return
      */
-    Page<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO);
+    IPage<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO);
 }

icssman-service/src/main/java/com/diagbot/service/LisMappingService.java

@@ -1,9 +1,9 @@
 package com.diagbot.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.LisMappingPageDTO;
 import com.diagbot.entity.LisMapping;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.LisMappingPageVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,5 +23,5 @@ public interface LisMappingService extends IService<LisMapping> {
      * @param lisMappingPageVO
      * @return
      */
-    Page<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO);
+    IPage<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO);
 }

icssman-service/src/main/java/com/diagbot/service/impl/LisMappingServiceImpl.java

@@ -1,11 +1,11 @@
 package com.diagbot.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.LisMappingPageDTO;
 import com.diagbot.entity.LisMapping;
 import com.diagbot.mapper.LisMappingMapper;
 import com.diagbot.service.LisMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.LisMappingPageVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
@@ -27,7 +27,7 @@ public class LisMappingServiceImpl extends ServiceImpl<LisMappingMapper, LisMapp
      * @param lisMappingPageVO
      * @return
      */
-    public Page<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO) {
+    public IPage<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO) {
         return this.baseMapper.lisMappingPage(lisMappingPageVO);
     }
 }

icssman-service/src/main/java/com/diagbot/vo/LisMappingPageVO.java

@@ -12,4 +12,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class LisMappingPageVO extends Page {
+    private String mealName;
+    private String itemName;
+    private String uniqueName;
 }

icssman-service/src/main/java/com/diagbot/web/LisMappingController.java

@@ -1,8 +1,15 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.LisMappingFacade;
+import com.diagbot.vo.LisMappingPageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,8 +23,26 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/lisMapping")
+@Api(value = "化验公表项映射维护相关API", tags = { "化验公表项映射维护相关API" })
 public class LisMappingController {
     @Autowired
     private LisMappingFacade lisMappingFacade;
 
+    /**
+     * 分页查询提示信息，带条件查询
+     *
+     * @param lisMappingPageVO
+     * @return
+     */
+    @ApiOperation(value = "分页查询提示信息，带条件[by:zhaops]",
+            notes = "current:页码，必填<br>" +
+                    "size:每页显示条数，必填<br>" +
+                    "mealName:大项名称<br>" +
+                    "itemName:小项名称<br>" +
+                    "uniqueName:公表名称<br>")
+    @PostMapping("/getLisMappingPage")
+    @SysLogger("getLisMappingPage")
+    public RespDTO getLisMappingPage(@RequestBody LisMappingPageVO lisMappingPageVO) {
+        return RespDTO.onSuc(lisMappingFacade.getLisMappingPage(lisMappingPageVO));
+    }
 }