目标fix

songhuangfeng123

2022-09-08 bfb4c1e1d4e3f99f74a51ef5b67531f9d91d0dde

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

@@ -4,31 +4,30 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.ListCheckDataDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetApproveDivideDetailDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.WorkApproveRelateDesc;
import com.gkhy.safePlatform.targetDuty.repository.TargetDivideDetailRepository;
import com.gkhy.safePlatform.targetDuty.repository.TargetDutyWorkApproveRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.ListCheckDataDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetApproveDivideDetailDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDutyWorkApproveDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.WorkApproveRelateDesc;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService;
import com.gkhy.safePlatform.targetDuty.service.baseService.TargetDivideDetailBaseService;
import com.gkhy.safePlatform.targetDuty.service.baseService.TargetDutyWorkApproveBaseService;
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
@@ -45,27 +44,28 @@
 * @since 2022-08-11 10:13:37
 */
@Service("targetDutyWorkApproveService")
public class TargetDutyWorkApproveServiceImpl extends ServiceImpl<TargetDutyWorkApproveRepository, TargetDutyWorkApprove> implements TargetDutyWorkApproveService {
public class TargetDutyWorkApproveServiceImpl implements TargetDutyWorkApproveService {

    @Autowired
    private TargetDutyWorkApproveRepository targetDutyWorkApproveRepository;
    private TargetDutyWorkApproveBaseService targetDutyWorkApproveBaseService;

    @Resource
    private CommonService commonService;

    @Autowired
    private TargetDivideDetailRepository targetDivideDetailRepository;
    private TargetDivideDetailBaseService targetDivideDetailBaseService;
    
   
   @Override
    public ResultVO queryAll(PageQuery<TargetDutyWorkApproveQueryCriteria> pageQuery) {
        PageUtils.checkCheck(pageQuery);
        Long pageIndex = pageQuery.getPageIndex();
        Long pageSize = pageQuery.getPageSize();
        IPage<TargetDutyWorkApprove> page = new Page<>(pageIndex, pageSize);

        QueryWrapper queryWrapper = QueryHelpPlus.getPredicate(TargetDutyWorkApprove.class, pageQuery.getSearchParams());
        queryWrapper.eq("del_flag","0");
        page = baseMapper.selectPage(page,queryWrapper);
        page = targetDutyWorkApproveBaseService.selectPage(page,queryWrapper);
        List<TargetDutyWorkApproveDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetDutyWorkApproveDto.class);

        return new SearchResultVO<>(
@@ -81,7 +81,7 @@

    @Override
    public List<TargetDutyWorkApprove> queryAll(TargetDutyWorkApproveQueryCriteria criteria) {
        return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetDutyWorkApprove.class, criteria));
        return targetDutyWorkApproveBaseService.queryAll( criteria);
    }

    @Override
@@ -105,7 +105,7 @@
            addInfo.setApproveResult(null);
            addInfo.setApproveMemo(null);
            addInfo.setSort(addInfo.getSort()+1);
            targetDutyWorkApproveRepository.insert(addInfo);
            targetDutyWorkApproveBaseService.save(addInfo);
        }

        // 更新原审批记录
@@ -117,7 +117,7 @@
        updateInfo.setApproveResult(targetDutyWorkApprove.getApproveResult());
        updateInfo.setApproveMemo(targetDutyWorkApprove.getApproveMemo());
        updateInfo.setChildId(addInfo.getId());
        targetDutyWorkApproveRepository.updateById(updateInfo);
        targetDutyWorkApproveBaseService.updateById(updateInfo);
    }

    @Override
@@ -156,7 +156,7 @@
        info.setSubmitPersonId(uid);
        info.setSubmitPersonName(uName);
        info.setSort(1);
        targetDutyWorkApproveRepository.insert(info);
        targetDutyWorkApproveBaseService.save(info);
    }

    @Override
@@ -165,7 +165,7 @@
        Long pageSize = pageQuery.getPageSize();
        IPage<ListCheckDataDto> page = new Page<>(pageIndex, pageSize);

        page = targetDutyWorkApproveRepository.listCheckData(page,pageQuery.getSearchParams().getRelateId());
        page = targetDutyWorkApproveBaseService.listCheckData(page,pageQuery.getSearchParams().getRelateId());

        List<ListCheckDataDto> respList = page.getRecords();
        // --------------------------- 获取部门信息-----------------------
@@ -194,7 +194,7 @@

    @Override
    public TargetDutyWorkApproveDto selectOne(Serializable id) {
       TargetDutyWorkApprove targetDutyWorkApprove = this.getById(id);
       TargetDutyWorkApprove targetDutyWorkApprove = targetDutyWorkApproveBaseService.getById(id);
       if(targetDutyWorkApprove == null){
           return new TargetDutyWorkApproveDto();
        }
@@ -206,7 +206,7 @@
        .collect(Collectors.toMap(WorkApproveRelateDesc::getId, Function.identity(),(k1, k2)->k1));

        //
        List<TargetDivideDetail> dList = targetDivideDetailRepository.selectBatchIds(relateDescMap.keySet());
        List<TargetDivideDetail> dList = targetDivideDetailBaseService.selectBatchIds(relateDescMap.keySet());
        List<TargetApproveDivideDetailDto> divideDetailList = BeanCopyUtils.copyBeanList(dList, TargetApproveDivideDetailDto.class);

        divideDetailList.forEach(f->{
@@ -236,4 +236,21 @@
        dto.setTargetDivideDetailList(divideDetailList);
        return dto;
    }

    @Override
    public void delete(Long[] ids) {
        if(ids == null){
            throw new TargetDutyException(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);

        List<TargetDutyWorkApprove> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetDutyWorkApprove info = new TargetDutyWorkApprove();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        targetDutyWorkApproveBaseService.updateBatchById(delList);
    }
}