新增登录，退出，上传，下载功能

docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvBasicApi.java

@@ -6,6 +6,7 @@ import com.docus.server.dto.recovery.rcvbasic.AddRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.DeleteRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.EditRcvBasicDTO;
 import com.docus.server.vo.recovery.rcvbasic.RcvBasicVO;
+import com.docus.server.vo.recovery.rcvbasic.SearchRcvBasicVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -104,7 +105,7 @@ public interface RcvBasicApi {
      * @return 分页列表
      */
     @PostMapping("/search")
-    PageResult<RcvBasicVO> search(@RequestBody SearchDTO searchDTO);
+    PageResult<SearchRcvBasicVO> search(@RequestBody SearchDTO searchDTO);
 
     /**
      * 新增
@@ -149,10 +150,10 @@ public interface RcvBasicApi {
     /**
      * 批量编辑
      *
-     * @param editRcvBasicDTO 编辑参数
+     * @param serialNumbers 编辑参数
      */
     @PutMapping("/editBatchById")
-    void editBatchById(@RequestBody List<EditRcvBasicDTO> editRcvBasicDTO);
+    void editBatchById(@RequestBody List<Serializable> serialNumbers);
 
     /**
      * 批量删除

docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java

@@ -22,15 +22,7 @@ import java.io.Serializable;
 @ApiModel(value = "EditRcvBasicDTO对象", description = "患者信息表")
 public class EditRcvBasicDTO implements Serializable {
 
-
-    @ApiModelProperty(value = "患者姓名")
-    private String name;
-
     @ApiModelProperty(value = "流水号")
     private String serialNumber;
 
-    @ApiModelProperty(value = "住院科室名称")
-    private String admissDeptName;
-
-
 }

docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/SearchRcvBasicVO.java

@@ -0,0 +1,36 @@
+package com.docus.server.vo.recovery.rcvbasic;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 患者信息表 VO
+ *
+ * @author AutoGenerator
+ * @since 2023-09-13
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "SearchRcvBasicVO对象", description = "患者信息表")
+public class SearchRcvBasicVO implements Serializable {
+
+
+    @ApiModelProperty(value = "患者姓名")
+    private String name;
+
+    @ApiModelProperty(value = "流水号")
+    private String serialNumber;
+
+    @ApiModelProperty(value = "住院科室名称")
+    private String admissDeptName;
+
+
+}

docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java

@@ -8,6 +8,7 @@ import com.docus.server.dto.recovery.rcvbasic.DeleteRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.EditRcvBasicDTO;
 import com.docus.server.service.IRcvBasicService;
 import com.docus.server.vo.recovery.rcvbasic.RcvBasicVO;
+import com.docus.server.vo.recovery.rcvbasic.SearchRcvBasicVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RestController;
@@ -125,7 +126,7 @@ public class RcvBasicController implements RcvBasicApi {
      */
     @ApiOperation("关键字搜索")
     @Override
-    public PageResult<RcvBasicVO> search(SearchDTO searchDTO) {
+    public PageResult<SearchRcvBasicVO> search(SearchDTO searchDTO) {
         return iRcvBasicService.search(searchDTO);
     }
 
@@ -191,8 +192,8 @@ public class RcvBasicController implements RcvBasicApi {
      */
     @ApiOperation("批量编辑")
     @Override
-    public void editBatchById(List<EditRcvBasicDTO> editRcvBasicDTO) {
+    public void editBatchById(List<Serializable> serialNumbers) {
-        iRcvBasicService.editBatchById(editRcvBasicDTO);
+        iRcvBasicService.editBatchById(serialNumbers);
     }
 
     /**

docus-recovery/src/main/java/com/docus/server/convert/RcvBasicConvert.java

@@ -5,6 +5,7 @@ import com.docus.server.dto.recovery.rcvbasic.AddRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.EditRcvBasicDTO;
 import com.docus.server.entity.recovery.RcvBasic;
 import com.docus.server.vo.recovery.rcvbasic.RcvBasicVO;
+import com.docus.server.vo.recovery.rcvbasic.SearchRcvBasicVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
@@ -42,5 +43,8 @@ public interface RcvBasicConvert {
 
     @Mappings({})
     PageResult<RcvBasicVO> convertVO(PageResult<RcvBasic> pageResult);
+
+    @Mappings({})
+    PageResult<SearchRcvBasicVO> convertPageVO(PageResult<RcvBasic> pageResult);
 }
 

docus-recovery/src/main/java/com/docus/server/service/IRcvBasicService.java

@@ -6,6 +6,7 @@ import com.docus.server.dto.recovery.rcvbasic.AddRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.DeleteRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.EditRcvBasicDTO;
 import com.docus.server.vo.recovery.rcvbasic.RcvBasicVO;
+import com.docus.server.vo.recovery.rcvbasic.SearchRcvBasicVO;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -120,10 +121,10 @@ public interface IRcvBasicService {
     /**
      * 批量编辑
      *
-     * @param editRcvBasicDTO 编辑参数
+     * @param serialNumbers 编辑参数
      * @return 成功或失败
      */
-    boolean editBatchById(List<EditRcvBasicDTO> editRcvBasicDTO);
+    boolean editBatchById(List<Serializable> serialNumbers);
 
     /**
      * 批量删除
@@ -173,7 +174,7 @@ public interface IRcvBasicService {
      * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<RcvBasicVO> search(SearchDTO searchDTO);
+    PageResult<SearchRcvBasicVO> search(SearchDTO searchDTO);
 
     /**
      * 名称不重复

docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java

@@ -9,9 +9,11 @@ import com.docus.server.dto.recovery.rcvbasic.AddRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.DeleteRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.EditRcvBasicDTO;
 import com.docus.server.entity.recovery.RcvBasic;
+import com.docus.server.enums.RecoveryStateEnum;
 import com.docus.server.infrastructure.dao.IRcvBasicDao;
 import com.docus.server.service.IRcvBasicService;
 import com.docus.server.vo.recovery.rcvbasic.RcvBasicVO;
+import com.docus.server.vo.recovery.rcvbasic.SearchRcvBasicVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -120,8 +122,8 @@ public class RcvBasicServiceImpl implements IRcvBasicService {
      * @return 分页列表
      */
     @Override
-    public PageResult<RcvBasicVO> search(SearchDTO searchDTO) {
+    public PageResult<SearchRcvBasicVO> search(SearchDTO searchDTO) {
-        return RcvBasicConvert.INSTANCE.convertVO(iRcvBasicDao.search(searchDTO));
+        return RcvBasicConvert.INSTANCE.convertPageVO(iRcvBasicDao.search(searchDTO));
 
         //PageResult<RcvBasicVO> result = RcvBasicConvert.INSTANCE.convertVO(iRcvBasicDao.search(searchDTO));
 
@@ -241,14 +243,20 @@ public class RcvBasicServiceImpl implements IRcvBasicService {
     /**
      * 批量编辑
      *
-     * @param editRcvBasicDTOList 编辑参数
+     * @param serialNumbers 编辑参数
      * @return 成功或失败
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean editBatchById(List<EditRcvBasicDTO> editRcvBasicDTOList) {
+    public boolean editBatchById(List<Serializable> serialNumbers) {
-        List<RcvBasic> rcvBasicList = RcvBasicConvert.INSTANCE.convertEditDOList(editRcvBasicDTOList);
+
-        return iRcvBasicDao.updateBatchById(rcvBasicList, IBaseDao.DEFAULT_BATCH_SIZE);
+        List<RcvBasic> rcvBasics = iRcvBasicDao.findBy("serialNumber", serialNumbers);
+
+        rcvBasics.forEach(p -> {
+            p.setRecoveryState(RecoveryStateEnum.RECYCLED_ALREADY);
+        });
+
+        return iRcvBasicDao.updateBatchById(rcvBasics, IBaseDao.DEFAULT_BATCH_SIZE);
     }
 
     /**