jiangping
2024-01-27 c6c95a49be6194989c124b8fd316fb5d434bd153
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
@@ -22,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -92,9 +93,29 @@
    }
    @Override
    public List<ApplyDetail> findList(ApplyDetail applyDetail) {
        QueryWrapper<ApplyDetail> wrapper = new QueryWrapper<>(applyDetail);
        return applyDetailMapper.selectList(wrapper);
    public List<ApplyDetail> findList(ApplyDetail applyDetailPageDTO) {
        if(applyDetailPageDTO.getApplyId() == null){
            return  new ArrayList<>();
        }
        MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(applyDetailPageDTO);
        queryWrapper.selectAll(ApplyDetail.class);
        queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
        queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
        queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
        queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
        queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId);
        queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId);
        queryWrapper.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId);
        queryWrapper.eq( ApplyDetail::getApplyId,applyDetailPageDTO.getApplyId());
        List<ApplyDetail> pageData=  applyDetailJoinMapper.selectJoinList( ApplyDetail.class, queryWrapper);
        if(pageData!=null){
            int num = 1;
            for (ApplyDetail d : pageData){
                d.setSortnum(num++);
            }
        }
        return pageData;
    }
@@ -177,6 +198,7 @@
        queryWrapper.selectAll(ApplyDetail.class);
        queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
        queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
        queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
        queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
        queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId);
        queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId);