目标fix

songhuangfeng123

2022-09-08 bfb4c1e1d4e3f99f74a51ef5b67531f9d91d0dde

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

@@ -14,6 +14,8 @@
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.baseService.TargetDivideDetailBaseService;
import com.gkhy.safePlatform.targetDuty.service.baseService.TargetMngBaseService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -39,13 +41,13 @@
 * @since 2022-07-20 13:32:39
 */
@Service("targetDivideDetailService")
public class TargetDivideDetailServiceImpl extends ServiceImpl<TargetDivideDetailRepository, TargetDivideDetail> implements TargetDivideDetailService {
public class TargetDivideDetailServiceImpl implements TargetDivideDetailService {

    @Autowired
    private TargetDivideDetailRepository targetDivideDetailRepository;
    private TargetDivideDetailBaseService targetDivideDetailBaseService;

    @Autowired
    private TargetMngRepository targetMngRepository;
    private TargetMngBaseService targetMngBaseService;
    
    
   
@@ -55,7 +57,7 @@
        Long pageSize = pageQuery.getPageSize();
        IPage<TargetDivideDetail> page = new Page<>(pageIndex, pageSize);

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

@@ -72,12 +74,15 @@

    @Override
    public List<TargetDivideDetail> queryAll(TargetDivideDetailQueryCriteria criteria) {
        return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetDivideDetail.class, criteria));
        return targetDivideDetailBaseService.queryAll(criteria);
    }

    @Override
    public void addOrUpdate(TargetDivideDetailSaveOrUpdate infoDto) {
        TargetMng targetMng = targetMngRepository.selectOne(new QueryWrapper<TargetMng>().eq("id",infoDto.getTargetId()));
        if(infoDto.getTargetId() == null){
            throw new TargetDutyException("缺少targetId");
        }
        TargetMng targetMng = targetMngBaseService.getOne(new QueryWrapper<TargetMng>().eq("id",infoDto.getTargetId()));
       if(targetMng == null){
            throw new TargetDutyException(TargetDutyResultCodes.E1);
        }
@@ -92,7 +97,7 @@
                info.setId(f);
                delList.add(info);
            });
            this.updateBatchById(delList);
            targetDivideDetailBaseService.updateBatchById(delList);
        }

        //保存主数据
@@ -103,18 +108,18 @@

        List<TargetDivideDetail> list = infoDto.getTargetDivideDetailList();
        list.forEach(f->{f.setTargetId(infoDto.getTargetId());});
        this.saveOrUpdateBatch(list);
        targetDivideDetailBaseService.saveOrUpdateBatch(list);

        //查询最新的分解数量，如果>0，设置状态为 《已分解》，否则设置为未分解
        int divideStatus = 2;
        if(infoDto.getTargetId() != null){
            long number = this.count(new QueryWrapper<TargetDivideDetail>().eq("target_id",infoDto.getTargetId()));
            long number = targetDivideDetailBaseService.count(new QueryWrapper<TargetDivideDetail>().eq("target_id",infoDto.getTargetId()));
            if(number > 0){
                divideStatus = 1;
            }
        }
        targetMng.setDivideStatus(divideStatus);
        targetMngRepository.update(targetMng,new UpdateWrapper<TargetMng>().eq("id",targetMng.getId()));
        targetMngBaseService.update(targetMng,new UpdateWrapper<TargetMng>().eq("id",targetMng.getId()));


    }