代码提交 bug解决

无关风月

2024-08-27 b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.SlGoodsShelf;
@@ -19,8 +20,10 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -49,13 +52,12 @@
        SysUser data = sysUserClient.getSysUser(userid).getData();

        LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
        if(slGoodsShelfQuery.getStoreManagementName()!=null){
            wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
        if(slGoodsShelfQuery.getStoreManagementName()!=null&& !slGoodsShelfQuery.getStoreManagementName().isEmpty()){
            wrapper.like(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
        }
        if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
        if (data.getRoleType()!=1){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
        }
        wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
        wrapper.eq(SlStoreManagement::getDelFlag,0);
        List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
        Set<Long> slStoreManagementIdList = null;
@@ -65,9 +67,24 @@

        Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
        LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
        wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
        if (slStoreManagementIdList.size()>0){
            wrapper1.in(SlGoodsShelf::getStoreManagementId,slStoreManagementIdList);
        if (StringUtils.hasLength(slGoodsShelfQuery.getGoodsShelfName())){
            wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
        }
        if (slGoodsShelfQuery.getStoreManagementNumber()!=null && slGoodsShelfQuery.getStoreManagementNumber()!=0){
            wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
        }

        if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
            if (slStoreManagementIdList.size() > 0) {
                wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
            } else {
                slStoreManagementIdList=new HashSet<>();
                slStoreManagementIdList.add(0L);
                wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
            }
        }
        if (slGoodsShelfQuery.getStoreManagementId()!=null){
            wrapper1.eq(SlGoodsShelf::getStoreManagementId, slGoodsShelfQuery.getStoreManagementId());
        }
        wrapper1.eq( SlGoodsShelf::getDelFlag,0);
        wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
@@ -79,7 +96,6 @@
            SlStoreManagement byId = SlStoreManagementService.getById(list.getStoreManagementId());
            if (byId!=null){
                list.setStoreManagementName(byId.getStoreManagementName());
                list.setStoreManagementNumber(byId.getStoreManagementNumber());
                list.setProvinceName(byId.getProvinceName());
                list.setProvinceCode(byId.getProvinceCode());
                list.setCityName(byId.getCityName());
@@ -110,11 +126,33 @@
            if (slGoodsShelfDTO.getStoreManagementNumber()!=null){
                slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
            }
            if (slGoodsShelfDTO.getGoodsShelfName()!=null){
                slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
            if (slGoodsShelfDTO.getStoreManagementId()!=null){
                slGoodsShelf.setStoreManagementId(slGoodsShelfDTO.getStoreManagementId());
            }
            this.updateById(slGoodsShelf);
        }
    }

    @Override
    public SlGoodsShelfVO getSlGoodsShelfOne(Long id) {
        SlGoodsShelf byId1 = this.getById(id);
        SlGoodsShelfVO slGoodsShelfVO=new SlGoodsShelfVO();
        BeanUtils.copyProperties(byId1,slGoodsShelfVO.getClass());
        slGoodsShelfVO.setGoodsShelfName(byId1.getGoodsShelfName());
        SlStoreManagement byId = SlStoreManagementService.getById(byId1.getStoreManagementId());
        slGoodsShelfVO.setStoreManagementId(byId1.getStoreManagementId());
        slGoodsShelfVO.setStoreManagementName(byId.getStoreManagementName());
        slGoodsShelfVO.setStoreManagementNumber(byId.getStoreManagementNumber());
        slGoodsShelfVO.setProvinceName(byId.getProvinceName());
        slGoodsShelfVO.setProvinceCode(byId.getProvinceCode());
        slGoodsShelfVO.setCityName(byId.getCityName());
        slGoodsShelfVO.setCityCode(byId.getCityCode());
        slGoodsShelfVO.setCountyName(byId.getCountyName());
        slGoodsShelfVO.setCountyCode(byId.getCountyCode());
        slGoodsShelfVO.setTownCode(byId.getTownCode());
        slGoodsShelfVO.setTownName(byId.getTownName());
        slGoodsShelfVO.setGrade(byId.getStoreManagementGrade());
        return slGoodsShelfVO;
    }

    @Override
@@ -122,7 +160,6 @@
        LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(SlGoodsShelf::getStoreManagementId,goodsShelfQuery.getStoreManagementId());
        wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,goodsShelfQuery.getStoreManagementNumber());
        wrapper1.eq(SlGoodsShelf::getIsStoreManagement,1);
        wrapper1.eq( SlGoodsShelf::getDelFlag,0);
        wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
        List<SlGoodsShelf> page2 = this.list(wrapper1);
@@ -131,12 +168,17 @@

    @Override
    public void fanzGoodsShelfList(GoodsShelfDTO goodsShelfDTO) {
        SlGoodsShelf slGoodsShelf = this.getById(goodsShelfDTO.getId());
        slGoodsShelf.setImgId(goodsShelfDTO.getImgId());
        slGoodsShelf.setIsStoreManagement(2);
        slGoodsShelf.setZbX(goodsShelfDTO.getZbX());
        slGoodsShelf.setZbY(goodsShelfDTO.getZbY());
        this.updateById(slGoodsShelf);
        for(GoodsShelfDTO.ShelfDTO g:goodsShelfDTO.getShelfDTOS()){
            SlGoodsShelf slGoodsShelf = this.getById(g.getId());
            slGoodsShelf.setImgId(goodsShelfDTO.getImgId());
            slGoodsShelf.setIsStoreManagement(2);
            slGoodsShelf.setZbX(g.getZbX());
            slGoodsShelf.setZbY(g.getZbY());
            slGoodsShelf.setWidth(g.getWidth());
            slGoodsShelf.setHeight(g.getHeight());
            this.updateById(slGoodsShelf);
        }

    }

    @Override