Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesInoculationRecordServiceImpl.java

@@ -1,23 +1,23 @@
package com.panzhihua.service_community.service.impl;

import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesUserInoculationByAppVO;
import com.panzhihua.service_community.dao.ComMngVaccinesEnrollRecordDAO;
import com.panzhihua.service_community.dao.ComMngVaccinesInoculationRecordDAO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesInoculationRecordDO;
import com.panzhihua.service_community.service.ComMngVaccinesEnrollRecordService;
import com.panzhihua.service_community.service.ComMngVaccinesInoculationRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -26,36 +26,44 @@
 */
@Slf4j
@Service
public class ComMngVaccinesInoculationRecordServiceImpl extends ServiceImpl<ComMngVaccinesInoculationRecordDAO, ComMngVaccinesInoculationRecordDO> implements ComMngVaccinesInoculationRecordService {
public class ComMngVaccinesInoculationRecordServiceImpl
    extends ServiceImpl<ComMngVaccinesInoculationRecordDAO, ComMngVaccinesInoculationRecordDO>
    implements ComMngVaccinesInoculationRecordService {

    @Resource
    private ComMngVaccinesEnrollRecordDAO comMngVaccinesEnrollRecordDAO;

    @Override
    public R getVaccinesUserInoculationListByApp(Long userId){
        //查询当前用户的家庭成员列表
    public R getVaccinesUserInoculationListByApp(Long userId) {
        // 查询当前用户的家庭成员列表
        List<VaccinesEnrollUserByAppVO> userLists = comMngVaccinesEnrollRecordDAO.getFamilyUserList(userId);
        List<Long> userIds = userLists.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getUserId()).collect(Collectors.toList());
        return R.ok(this.baseMapper.getUserInoculationListByApp(userIds,userId));
        List<Long> userIds = userLists.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getUserId())
            .collect(Collectors.toList());
        return R.ok(this.baseMapper.getUserInoculationListByApp(userIds, userId));
    }

    /**
     * 查询接种记录列表
     * @param inoculationByAdminDTO     请求参数
     * @return  接种记录列表
     * 
     * @param inoculationByAdminDTO
     *            请求参数
     * @return 接种记录列表
     */
    @Override
    public R getVaccinesInoculationListByAdmin(VaccinesInoculationByAdminDTO inoculationByAdminDTO){
        return R.ok(this.baseMapper.getVaccinesInoculationListByAdmin(new Page(inoculationByAdminDTO.getPageNum(),inoculationByAdminDTO.getPageSize()),inoculationByAdminDTO));
    public R getVaccinesInoculationListByAdmin(VaccinesInoculationByAdminDTO inoculationByAdminDTO) {
        return R.ok(this.baseMapper.getVaccinesInoculationListByAdmin(
            new Page(inoculationByAdminDTO.getPageNum(), inoculationByAdminDTO.getPageSize()), inoculationByAdminDTO));
    }

    /**
     * 接种记录信息导出
     * @param inoculationByAdminDTO     请求参数
     * @return  导出结果
     * 
     * @param inoculationByAdminDTO
     *            请求参数
     * @return 导出结果
     */
    @Override
    public R exportVaccinesInoculationListByAdmin(VaccinesInoculationByAdminDTO inoculationByAdminDTO){
    public R exportVaccinesInoculationListByAdmin(VaccinesInoculationByAdminDTO inoculationByAdminDTO) {
        return R.ok(this.baseMapper.exportVaccinesInoculationListByAdmin(inoculationByAdminDTO));
    }