代码提交 bug解决

无关风月

2024-09-03 56dfe0d4bf81262622a1919cceb2b039fd356209

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

@@ -22,6 +22,7 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
@@ -36,9 +37,12 @@

    @Resource
    private SlStoreManagementMapper slStoreManagementMapper;
    @Resource
    private SlEquipmentMapper slEquipmentMapper;

    @Override
    public PageDTO<SlEquipmentVO> getSlEquipmentList(SlEquipmentQuery slEquipmentQuery) {

        Page<SlEquipment> page = new Page<>(slEquipmentQuery.getPageCurr(), slEquipmentQuery.getPageSize());
        LambdaQueryWrapper< SlEquipment> wrapper= Wrappers.lambdaQuery();
        if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getEquipmentName()!=""){
@@ -73,6 +77,7 @@
        if (slEquipmentDTO.getId()==null){
            List<SlEquipment> list = this.list(new QueryWrapper<SlEquipment>()
                    .eq("type", slEquipmentDTO.getType())
                            .eq("del_flag","0")
                    .eq("equipment_num", slEquipmentDTO.getEquipmentNum()));
            if (!list.isEmpty()){
                return AjaxResult.error("当前设备已存在相同设备编号");
@@ -82,12 +87,14 @@
            slEquipment.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
            slEquipment.setType(slEquipmentDTO.getType());
            slEquipment.setManagementId(slEquipmentDTO.getManagementId());
            slEquipment.setCreateTime(new Date());
            this.save(slEquipment);
        }else{
            SlEquipment byId = this.getById(slEquipmentDTO.getId());
            List<SlEquipment> list = this.list(new QueryWrapper<SlEquipment>()
                    .eq("type", slEquipmentDTO.getType())
                    .ne("id",slEquipmentDTO.getId())
                            .eq("del_flag","0")
                    .eq("equipment_num", slEquipmentDTO.getEquipmentNum()));
            if (!list.isEmpty()){
                return AjaxResult.error("当前设备已存在相同设备编号");
@@ -134,8 +141,15 @@

    @Override
    public Integer getequipmente(SeBei seBei) {
        // 仓库ids
        List<Long> collect = slEquipmentMapper.selectList(new QueryWrapper<SlEquipment>()
                .eq("del_flag", "0")
                .eq("equipment_num", seBei.getSebei())
        ).stream().map(SlEquipment::getManagementId).collect(Collectors.toList());
        if (collect.isEmpty()){
            return 9;
        }
        LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();

        List<Long> arr=new ArrayList<>();
        wrapper.eq(SlStoreManagement::getDelFlag,0);
        List<SlStoreManagement> page = slStoreManagementMapper.selectList(wrapper);
@@ -147,6 +161,9 @@
        }
        LambdaQueryWrapper< SlStoreManagement> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(SlStoreManagement::getDelFlag,0);
        if (!collect.isEmpty()){
            wrapper1.in(SlStoreManagement::getId,collect);
        }
        List<SlStoreManagement> page1 = slStoreManagementMapper.selectList(wrapper1);
        for (SlStoreManagement a1:page1){
            List<String> list = Arrays.asList(a1.getCompetentId().split(","));
@@ -156,6 +173,9 @@
        }
        LambdaQueryWrapper< SlStoreManagement> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(SlStoreManagement::getDelFlag,0);
        if (!collect.isEmpty()){
            wrapper2.in(SlStoreManagement::getId,collect);
        }
        List<SlStoreManagement> page2 = slStoreManagementMapper.selectList(wrapper2);
        for (SlStoreManagement a2:page2){
            List<String> list = Arrays.asList(a2.getDirectorId().split(","));