假删除fix

songhuangfeng123

2022-09-01 b854d8d7604329dcf99584d15f83ff02076d9e07

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

@@ -14,6 +14,7 @@
import com.gkhy.safePlatform.targetDuty.repository.ExamineItemRepository;
import com.gkhy.safePlatform.targetDuty.repository.ExamineTemplateRepository;
import com.gkhy.safePlatform.targetDuty.entity.ExamineTemplate;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.ExamineItemService;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
import org.springframework.stereotype.Service;
@@ -28,11 +29,10 @@
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -52,6 +52,9 @@

    @Autowired
    private ExamineItemService examineItemService;

    @Resource
    private CommonService commonService;
    
   
   @Override
@@ -64,13 +67,30 @@
                QueryHelpPlus.getPredicate(ExamineTemplate.class, pageQuery.getSearchParams()));
        List<ExamineTemplateDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), ExamineTemplateDto.class);

        // TODO:获取设定人部门名称
        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f->{
            collectDepIdSet.add(f.getSetPersonDepartmentId());
        });
        //获取部门名集合
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

        respList.forEach(f->{
            f.setSetPersonDepartmentName(depNameMap.get(f.getSetPersonDepartmentId()));
        });

        //获取考核项目明细
        respList.forEach(f->{
            List<ExamineItem> list = examineItemRepository.selectList(new QueryWrapper<ExamineItem>().eq("examine_template_id",f.getId()));
            f.setExamineItemList(list);
        });


        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,
                pageSize,page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
@@ -102,7 +122,14 @@
        if(StringUtils.hasText(infoDto.getDelExamineItems())){
            List<Long> idList = Arrays.stream(infoDto.getDelExamineItems().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            examineItemService.removeByIds(idList);
            List<ExamineItem> delList = new ArrayList<>();
            idList.forEach(f->{
                ExamineItem info = new ExamineItem();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            examineItemService.updateBatchById(delList);
        }

        ExamineTemplate examineTemplate = BeanCopyUtils.copyBean(infoDto, ExamineTemplate.class);