From a5b09629334ddfac01ce316da737077bb039f7ed Mon Sep 17 00:00:00 2001 From: linrf Date: Fri, 15 Sep 2023 11:12:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E9=80=80=E5=87=BA=EF=BC=8C=E4=B8=8A=E4=BC=A0=EF=BC=8C=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/api/recovery/RcvBasicApi.java | 7 ++-- .../recovery/rcvbasic/EditRcvBasicDTO.java | 8 ----- .../recovery/rcvbasic/SearchRcvBasicVO.java | 36 +++++++++++++++++++ .../server/controller/RcvBasicController.java | 7 ++-- .../docus/server/convert/RcvBasicConvert.java | 4 +++ .../server/service/IRcvBasicService.java | 7 ++-- .../service/impl/RcvBasicServiceImpl.java | 20 +++++++---- 7 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/SearchRcvBasicVO.java diff --git a/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvBasicApi.java b/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvBasicApi.java index b7ddbca..f31b51c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvBasicApi.java +++ b/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 search(@RequestBody SearchDTO searchDTO); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 @@ -149,10 +150,10 @@ public interface RcvBasicApi { /** * 批量编辑 * - * @param editRcvBasicDTO 编辑参数 + * @param serialNumbers 编辑参数 */ @PutMapping("/editBatchById") - void editBatchById(@RequestBody List editRcvBasicDTO); + void editBatchById(@RequestBody List serialNumbers); /** * 批量删除 diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java index 515c60f..277a083 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/recovery/rcvbasic/EditRcvBasicDTO.java +++ b/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; - - } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/SearchRcvBasicVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/recovery/rcvbasic/SearchRcvBasicVO.java new file mode 100644 index 0000000..1c8c588 --- /dev/null +++ b/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; + + +} diff --git a/docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java b/docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java index f1a7e50..46e8fb4 100644 --- a/docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java +++ b/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 search(SearchDTO searchDTO) { + public PageResult search(SearchDTO searchDTO) { return iRcvBasicService.search(searchDTO); } @@ -191,8 +192,8 @@ public class RcvBasicController implements RcvBasicApi { */ @ApiOperation("批量编辑") @Override - public void editBatchById(List editRcvBasicDTO) { - iRcvBasicService.editBatchById(editRcvBasicDTO); + public void editBatchById(List serialNumbers) { + iRcvBasicService.editBatchById(serialNumbers); } /** diff --git a/docus-recovery/src/main/java/com/docus/server/convert/RcvBasicConvert.java b/docus-recovery/src/main/java/com/docus/server/convert/RcvBasicConvert.java index 13bead9..879a831 100644 --- a/docus-recovery/src/main/java/com/docus/server/convert/RcvBasicConvert.java +++ b/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 convertVO(PageResult pageResult); + + @Mappings({}) + PageResult convertPageVO(PageResult pageResult); } diff --git a/docus-recovery/src/main/java/com/docus/server/service/IRcvBasicService.java b/docus-recovery/src/main/java/com/docus/server/service/IRcvBasicService.java index b5012d4..6e65a69 100644 --- a/docus-recovery/src/main/java/com/docus/server/service/IRcvBasicService.java +++ b/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); + boolean editBatchById(List serialNumbers); /** * 批量删除 @@ -173,7 +174,7 @@ public interface IRcvBasicService { * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchDTO searchDTO); + PageResult search(SearchDTO searchDTO); /** * 名称不重复 diff --git a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java b/docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java index 969228d..468cd28 100644 --- a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java +++ b/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 search(SearchDTO searchDTO) { - return RcvBasicConvert.INSTANCE.convertVO(iRcvBasicDao.search(searchDTO)); + public PageResult search(SearchDTO searchDTO) { + return RcvBasicConvert.INSTANCE.convertPageVO(iRcvBasicDao.search(searchDTO)); //PageResult 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 editRcvBasicDTOList) { - List rcvBasicList = RcvBasicConvert.INSTANCE.convertEditDOList(editRcvBasicDTOList); - return iRcvBasicDao.updateBatchById(rcvBasicList, IBaseDao.DEFAULT_BATCH_SIZE); + public boolean editBatchById(List serialNumbers) { + + List rcvBasics = iRcvBasicDao.findBy("serialNumber", serialNumbers); + + rcvBasics.forEach(p -> { + p.setRecoveryState(RecoveryStateEnum.RECYCLED_ALREADY); + }); + + return iRcvBasicDao.updateBatchById(rcvBasics, IBaseDao.DEFAULT_BATCH_SIZE); } /**