diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java index c932389..7225ae6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -20,5 +20,5 @@ * 用户集合 */ @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") - private List userIds; + private List userIds; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java index c932389..7225ae6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -20,5 +20,5 @@ * 用户集合 */ @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") - private List userIds; + private List userIds; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java new file mode 100644 index 0000000..608ccfd --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java @@ -0,0 +1,14 @@ +package com.casic.missiles.dto.quality; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class QualityUserInfoDTO { + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + @ApiModelProperty(value = "用户ID", dataType = "Long") + private Long userId; + @ApiModelProperty(value = "用户名称", dataType = "Long") + private String name; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java index c932389..7225ae6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -20,5 +20,5 @@ * 用户集合 */ @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") - private List userIds; + private List userIds; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java new file mode 100644 index 0000000..608ccfd --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java @@ -0,0 +1,14 @@ +package com.casic.missiles.dto.quality; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class QualityUserInfoDTO { + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + @ApiModelProperty(value = "用户ID", dataType = "Long") + private Long userId; + @ApiModelProperty(value = "用户名称", dataType = "Long") + private String name; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 5f488ac..5879fb1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.dto.quality.QualitySelectDTO; import com.casic.missiles.dto.quality.QualityUserDTO; +import com.casic.missiles.dto.quality.QualityUserInfoDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; @@ -74,9 +75,9 @@ QueryWrapper query = new QueryWrapper<>(); query.eq("conference_id",id); List users = bizQualityConferenceRelUserService.list(query); - List userDTOS = users.stream().map(relUser -> { - UserDTO userDTO = new UserDTO(); - userDTO.setId(relUser.getId()); + List userDTOS = users.stream().map(relUser -> { + QualityUserInfoDTO userDTO = new QualityUserInfoDTO(); + userDTO.setId(relUser.getUserId()); userDTO.setName(relUser.getUserName()); return userDTO; }).collect(Collectors.toList()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java index c932389..7225ae6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserDTO.java @@ -20,5 +20,5 @@ * 用户集合 */ @ApiModelProperty(value = "选择用户集合(id name)", dataType = "List") - private List userIds; + private List userIds; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java new file mode 100644 index 0000000..608ccfd --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/QualityUserInfoDTO.java @@ -0,0 +1,14 @@ +package com.casic.missiles.dto.quality; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class QualityUserInfoDTO { + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + @ApiModelProperty(value = "用户ID", dataType = "Long") + private Long userId; + @ApiModelProperty(value = "用户名称", dataType = "Long") + private String name; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 5f488ac..5879fb1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.dto.quality.QualitySelectDTO; import com.casic.missiles.dto.quality.QualityUserDTO; +import com.casic.missiles.dto.quality.QualityUserInfoDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRecordMapper; import com.casic.missiles.model.quality.BizQualityConferenceRecord; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; @@ -74,9 +75,9 @@ QueryWrapper query = new QueryWrapper<>(); query.eq("conference_id",id); List users = bizQualityConferenceRelUserService.list(query); - List userDTOS = users.stream().map(relUser -> { - UserDTO userDTO = new UserDTO(); - userDTO.setId(relUser.getId()); + List userDTOS = users.stream().map(relUser -> { + QualityUserInfoDTO userDTO = new QualityUserInfoDTO(); + userDTO.setId(relUser.getUserId()); userDTO.setName(relUser.getUserName()); return userDTO; }).collect(Collectors.toList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index b27a235..c4caebc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.dto.quality.QualityUserDTO; +import com.casic.missiles.dto.quality.QualityUserInfoDTO; import com.casic.missiles.mapper.quality.BizQualityConferenceRelUserMapper; import com.casic.missiles.model.quality.BizQualityConferenceRelUser; import com.casic.missiles.modular.system.dto.UserDTO; @@ -45,8 +46,8 @@ List list = list(query); //历史转数组 List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); - List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); - Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); + List userDtos = dto.getUserIds().stream().map(QualityUserInfoDTO::getUserId).collect(Collectors.toList()); + Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(QualityUserInfoDTO::getId, (userDTO -> userDTO))); //过滤移除名单 List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); //过滤新增名单