screen-manage 修改型号查询BUG，修改sql语句，改为左外连

kaiyu

2021-05-21 349c49d9c6407dbfc46a33f9795647a71406dd0d

 screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java

@@ -1,6 +1,7 @@
package com.moral.api.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
import com.moral.api.entity.User;
@@ -10,9 +11,7 @@
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
import com.moral.api.pojo.form.version.VersionInsertForm;
import com.moral.api.pojo.form.version.VersionQueryForm;
import com.moral.api.pojo.form.version.VersionUpdateForm;
import com.moral.api.pojo.form.version.*;
import com.moral.api.service.VersionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -24,9 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * <p>
@@ -83,13 +80,13 @@
        //查询版本对应的因子和单位
        List<Integer> versionsIds = new ArrayList<>();
        versions.forEach(value -> versionsIds.add(value.getId()));
        List<Version> result = new ArrayList<>();
        List<Version> queryResult = new ArrayList<>();
        if (!ObjectUtils.isEmpty(versionsIds)) {
            result = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
            queryResult = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
        }
        //封装返回数据
        List<VersionDTO> dtos = new ArrayList<>();
        result.forEach(value -> dtos.add(new VersionDTO(value)));
        queryResult.forEach(value -> dtos.add(new VersionDTO(value)));
        dto.setVersionDTOS(dtos);
        dto.setCurrent(versionsPage.getCurrent());
        dto.setPages(versionsPage.getPages());
@@ -156,4 +153,34 @@
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }

    @Override
    @Transactional
    public VersionDTO delete(VersionDeleteForm form) {
        //创建返回对象
        VersionDTO dto = new VersionDTO();
        //取参
        Integer id = form.getId();
        //查询要删除的版本用于记录日志
        Version oldVersion = versionMapper.selectById(id);
        //执行删除
        Version deleteVersion = new Version();
        deleteVersion.setId(oldVersion.getId());
        deleteVersion.setIsDelete(Constants.DELETE);
        versionMapper.updateById(deleteVersion);
        //删除型号和因子单位对应表
        UpdateWrapper deleteSensorUnitWrapper = new UpdateWrapper();
        deleteSensorUnitWrapper.eq("version_id",id);
        deleteSensorUnitWrapper.set("is_delete",Constants.DELETE);
        versionSensorUnitMapper.update(null,deleteSensorUnitWrapper);
        //封装返回结果
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }

    @Override
    public VersionDTO updateSensorUnits(VersionSensorUnitForm form) {
        return null;
    }
}