代码提交

liusheng

3 天以前 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java

@@ -8,14 +8,17 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
import com.ruoyi.project.domain.dto.ServiceDonatecompletioninfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO;
import com.ruoyi.project.mapper.ServiceDonatecompletioninfoMapper;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
@@ -78,10 +81,43 @@
    }

    @Override
    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
            b = this.save(serviceDonatecompletioninfo);
            if (b == true && CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
                for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
                    serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfo.getInfoid());
                    serviceDonatecomporgan.setDonatecompletioninfoId(serviceDonatecompletioninfo.getId());
                    serviceDonatecomporganService.save(serviceDonatecomporgan);
                }
            }
        }
        return b;
    }

    @Override
    public boolean edit(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
            b = this.updateById(serviceDonatecompletioninfo);
        }
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
            for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
                serviceDonatecomporganService.updateById(serviceDonatecomporgan);
            }
        }

        return b;
    }

    @Override
    public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
        List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);

        if(CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
            for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
                ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());
@@ -100,7 +136,7 @@
     * @return
     */
    @Override
    public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
    public List<ServiceDonatecompletioninfoDTO> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        LambdaQueryWrapper<ServiceDonatecompletioninfo> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getDonorno())) {
            wrappers.eq(ServiceDonatecompletioninfo::getDonorno, serviceDonatecompletioninfo.getDonorno());
@@ -118,19 +154,21 @@
            wrappers.eq(ServiceDonatecompletioninfo::getInfoid, serviceDonatecompletioninfo.getInfoid());
        }
        List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList = this.list(wrappers);
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoList)) {
            for (ServiceDonatecompletioninfo serviceDonatecompletioninfo1 : serviceDonatecompletioninfoList) {
                if (serviceDonatecompletioninfo1.getInfoid() != null) {

        List<ServiceDonatecompletioninfoDTO> serviceDonatecompletioninfoDTOList = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoList, ServiceDonatecompletioninfoDTO.class);
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoDTOList)) {
            for (ServiceDonatecompletioninfoDTO serviceDonatecompletioninfoDTO : serviceDonatecompletioninfoDTOList) {
                if (serviceDonatecompletioninfoDTO.getInfoid() != null) {
                    ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                    serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfo1.getInfoid());
                    serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfoDTO.getInfoid());
                    List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
                    serviceDonatecompletioninfo1.setServiceDonatecomporganList(serviceDonatecomporgans);
                    serviceDonatecompletioninfoDTO.setServiceDonatecomporganList(serviceDonatecomporgans);
                }

            }
        }

        return this.list(wrappers);
        return serviceDonatecompletioninfoDTOList;
    }