假删除fix

songhuangfeng123

2022-09-01 b854d8d7604329dcf99584d15f83ff02076d9e07

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java

@@ -4,9 +4,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.entity.TargetType;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDivideDetailQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDivideDetailDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngDto;
import com.gkhy.safePlatform.targetDuty.repository.TargetExamineRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
import com.gkhy.safePlatform.targetDuty.repository.TargetTypeRepository;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetExamineService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +29,8 @@
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import org.springframework.util.StringUtils;

import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -36,27 +45,16 @@
    @Autowired
    private TargetExamineRepository targetExamineRepository;

    @Autowired
    private TargetMngRepository targetMngRepository;
    @Resource
    private CommonService commonService;

    @Resource
    private TargetDivideDetailService targetDivideDetailService;

   @Override
    public ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
        Long pageSize = pageQuery.getPageSize();
        IPage<TargetExamine> page = new Page<>(pageIndex, pageSize);

        page = baseMapper.selectPage(page,
                QueryHelpPlus.getPredicate(TargetExamine.class, pageQuery.getSearchParams()));
        List<TargetExamineDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetExamineDto.class);

        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
        );
    }
    @Autowired
    private TargetTypeRepository targetTypeRepository;


    @Override
@@ -64,19 +62,4 @@
        return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetExamine.class, criteria));
    }

    @Override
    public void addOrUpdate(TargetExamineSaveOrUpdate infoDto) {


        if(StringUtils.hasText(infoDto.getDelIds())) {
            List<Long> idList = Arrays.stream(infoDto.getDelIds().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            this.removeByIds(idList);
        }

        infoDto.getExamineList().forEach(f->{
            f.setTargetId(infoDto.getId());
        });
        this.saveOrUpdateBatch(infoDto.getExamineList());
    }
}
}