接口整理

jiangping

2023-10-11 146442fe47b195f899e567eafc1d32f05c3bc13c

 server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java

@@ -20,11 +20,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.Date;
import java.util.List;
@@ -112,46 +112,23 @@
        IPage<BikeRepair> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getCreateDateStart() != null
                && pageWrap.getModel().getCreateDateEnd() != null) {
            queryWrapper.ge(BikeRepair::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()));
            queryWrapper.le(BikeRepair::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()));
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.eq(BikeRepair::getStatus, pageWrap.getModel().getStatus());
        }
        queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
                    .leftJoin(Bikes.class,Bikes::getId,BikeRepair::getBinkeId)
                    .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
                    .leftJoin("base_param bpp on b.param_id = bp.id and bp.type = 1");
        queryWrapper.selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
                    .selectAs(BikeRepair::getLinkname,BikeRepairDTO::getLinkname)
                    .selectAs(BikeRepair::getLinkphone,BikeRepairDTO::getLinkphone)
                    .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId);
        queryWrapper.selectAll(BikeRepair.class)
                    .selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
                    .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
                    .selectAs(BikeRepair::getCreateDate,BikeRepairDTO::getCreateDate)
                    .selectAs(BikeRepair::getStatus,BikeRepairDTO::getStatus)
                    .selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName)
                    .select("bpp.name as problemName");
        queryWrapper.like(!StringUtils.isEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
                    .like(!StringUtils.isEmpty(pageWrap.getModel().getBikeId()),Bikes::getId,pageWrap.getModel().getBikeId())
                    .eq(!StringUtils.isEmpty(pageWrap.getModel().getStatus()),BikeRepair::getStatus,pageWrap.getModel().getStatus())
                    .ge(Objects.nonNull(pageWrap.getModel().getCreateDateStart()),
                            BikeRepair::getCreateDate,
                            Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
                    .le(Objects.nonNull(pageWrap.getModel().getCreateDateEnd()),
                            BikeRepair::getCreateDate,
                            Utils.Date.getStart(pageWrap.getModel().getCreateDateEnd()));
                    .selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName);
        queryWrapper.like(StringUtils.isNotEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
                    .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),Bikes::getCode,pageWrap.getModel().getBikeCode())
                    .eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartDate()),BikeRepair::getCreateDate,pageWrap.getModel().getStartDate())
                    .le(Objects.nonNull(pageWrap.getModel().getEndDate()),BikeRepair::getCreateDate,pageWrap.getModel().getEndDate());
        return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper));
    }

    @Override
    public BikeRepairProblemDTO getBikeRepairProblemDTO(String id) {
        BikeRepairProblemDTO bikeRepairProblemDTO = new BikeRepairProblemDTO();

        BikeRepair bikeRepair = bikeRepairMapper.selectById(id);
        bikeRepairProblemDTO.setParam(bikeRepair.getParam());

//        multifileMapper.multifile);
    public List<Multifile> getBikeRepairProblemDTO(String id) {
        QueryWrapper<Multifile> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Multifile::getObjId,id)
@@ -159,16 +136,17 @@
                .eq(Multifile::getIsdeleted,Constants.ZERO);
        List<Multifile> multifiles = multifileMapper.selectList(wrapper);
        //TODO 需要修改
        String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode();
        String projectFile = systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECT_FILE).getCode();
        String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECT_FILE).getCode();
        if (!CollectionUtils.isEmpty(multifiles)){
            multifiles.forEach(s->{
                s.setFileurlfull(path+projectFile+s.getFileurl());
                if(StringUtils.isNotBlank(s.getFileurl())){
                    //完整附件地址
                    s.setFileurlfull(path+s.getFileurl());
                }
            });
            bikeRepairProblemDTO.setList(multifiles);
        }

        return null;
        return multifiles;
    }

    @Override