10.28

Mr.Zhang

2023-10-28 805fcd4d881ac13d0fe9961076ead66a71c20b2d

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

@@ -116,14 +116,13 @@
        MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
                    .leftJoin(Bikes.class,Bikes::getId,BikeRepair::getBinkeId)
                    .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId);
                    .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
        queryWrapper.selectAll(BikeRepair.class)
                    .selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
                    .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
                    .selectAs(BikeRepair::getBinkeId,BikeRepairDTO::getBikeCode)
                    .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())
                    .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),BikeRepair::getBinkeId,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());
@@ -139,7 +138,7 @@
                .eq(Multifile::getIsdeleted,Constants.ZERO);
        List<Multifile> multifiles = multifileMapper.selectList(wrapper);
        //TODO 需要修改
        String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECT_FILE).getCode();
        String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.REPAIR).getCode();
        if (!CollectionUtils.isEmpty(multifiles)){
            multifiles.forEach(s->{
                if(StringUtils.isNotBlank(s.getFileurl())){
@@ -165,12 +164,15 @@
        BeanUtils.copyProperties(repairRequest,bikeRepair);
        bikeRepair.setCreateDate(new Date());
        bikeRepair.setIsdeleted(Constants.ZERO);
        bikeRepair.setStatus(Constants.ZERO);
        bikeRepair.setId(Constants.getUUID());
        bikeRepairMapper.insert(bikeRepair);
        //处理附件信息
        List<String> stringList = repairRequest.getFileUrlList();
        if(!Objects.isNull(stringList)&&stringList.size()>Constants.ZERO){
            for (int i = 0; i < stringList.size(); i++) {
                Multifile multifile = new Multifile();
                multifile.setId(Constants.getUUID());
                multifile.setCreateDate(new Date());
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setSortnum(i+Constants.ONE);