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 645e497..1bb69d0 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 @@ -10,7 +10,6 @@ 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.MappingTarget; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; import org.springframework.beans.BeanUtils; @@ -41,10 +40,6 @@ public interface RcvBasicConvert { @Mappings({}) List convertAddDOList(List addRcvBasicDTO); - @Mappings({}) - RcvBasic convertDO(AddRcvBasicDTO addRcvBasicDTO, @MappingTarget RcvBasic rcvBasic); - - default List convertUpdateDOList(List updateDataList, List rcvBasicsDO) { Map idToDOMap = ListUtils.toMap(updateDataList, AddRcvBasicDTO::getId); @@ -54,7 +49,16 @@ public interface RcvBasicConvert { Long id = rcvBasic.getId(); if (idToDOMap.containsKey(id)) { AddRcvBasicDTO addRcvBasicDTO = idToDOMap.get(id); - basics.add(RcvBasicConvert.INSTANCE.convertDO(addRcvBasicDTO, rcvBasic)); + + rcvBasic.setAdmissId(addRcvBasicDTO.getAdmissId()); + rcvBasic.setAdmissTimes(addRcvBasicDTO.getAdmissTimes()); + rcvBasic.setSerialNumber(addRcvBasicDTO.getSerialNumber()); + rcvBasic.setName(addRcvBasicDTO.getName()); + rcvBasic.setAttendingName(addRcvBasicDTO.getAttendingName()); + rcvBasic.setDisDate(addRcvBasicDTO.getDisDate()); + rcvBasic.setDisDept(addRcvBasicDTO.getDisDept()); + rcvBasic.setDisDeptName(addRcvBasicDTO.getDisDeptName()); + basics.add(rcvBasic); } }