From 80ca6abff38cf5520fcd0825d9d46582d3063f2d Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 22 八月 2022 15:39:37 +0800 Subject: [PATCH] 事故案例 --- goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java | 72 +++++++++++++++++------------------ 1 files changed, 35 insertions(+), 37 deletions(-) diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java index 82c4d72..8f0e114 100644 --- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java +++ b/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; /** @@ -35,28 +44,17 @@ @Autowired private TargetExamineRepository targetExamineRepository; - - - - @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); + @Autowired + private TargetMngRepository targetMngRepository; + @Resource + private CommonService commonService; - return new SearchResultVO<>( - true, - pageIndex, - pageSize,page.getPages(), - page.getTotal(), - respList, - ResultCodes.OK - ); - } + @Resource + private TargetDivideDetailService targetDivideDetailService; + + @Autowired + private TargetTypeRepository targetTypeRepository; @Override @@ -64,19 +62,19 @@ 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()); - } +// @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()); +// } } \ No newline at end of file -- Gitblit v1.9.2