Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 c28d3bb363dde2afb44c168b93379b2bf6b1f67f

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java

@@ -1,7 +1,8 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
@@ -10,7 +11,6 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

/**
@@ -25,25 +25,28 @@
    @Resource
    InspectUnacceptedMapper inspectUnacceptedMapper;

    //查询原材料不合格品检验单列表
    //查询成品不合格品检验单列表
    @Override
    public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer type) {
        if (type==null){
            type=2;//为空是原材料2
        }
        switch (type) {
            case 2:
                //2是查询原材料不合格品
                return inspectUnacceptedMapper.selectUnRawInspectsList(page,formTime,dealState,2);
            case 1:
                //1是查询过程不合格品
                return inspectUnacceptedMapper.selectInsList(page,formTime,dealState,1);
            case 0:
                //0是查询成品不合格品
                return inspectUnacceptedMapper.selectInsList(page,formTime,dealState,0);
            default:
                return null;
        }
    public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
        return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
    }

    @Override
    public IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus) {
        return inspectUnacceptedMapper.selectUnqualifiedRawMaterials(page, formTime, productName, supplier, processingStatus);
    }

    @Override
    public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state) {
        return inspectUnacceptedMapper.selectDisposal(page, specificationModel, productName, productCategories, state);
    }

    @Override
    public Integer descriptionUpdate(Integer rawUnacceptedId, String tell) {
        LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
                .eq(InspectUnaccepted::getId, rawUnacceptedId)
                .set(InspectUnaccepted::getTell, tell);
        return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
    }
}