质量检验添加检测标准id+增加手动新增选择产品之后的查询检测标准项接口

zss

8 天以前 8e9668652b199019081b52d876833e353d91e554

质量检验添加检测标准id+增加手动新增选择产品之后的查询检测标准项接口

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java

@@ -1,12 +1,16 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Nonnull;
import javax.annotation.Resource;
import java.util.List;

@@ -24,6 +28,9 @@

    @Resource
    private IQualityTestStandardService qualityTestStandardService;

    @Resource
    private QualityTestStandardParamService qualityTestStandardParamService;


    /**
@@ -90,4 +97,22 @@
        return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
    }

    /**
     * 根据产品id查询相关的检验标准
     * @return
     */
    @GetMapping("/getQualityTestStandardByProductId")
    public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
        return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
    }

    /**
     * 根据检测标准id查询相关的检验标准参数
     * @return
     */
    @GetMapping("/getQualityTestStandardParamByTestStandardId")
    public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
    }

}

 src/main/java/com/ruoyi/quality/mapper/QualityTestStandardMapper.java

@@ -7,6 +7,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * 检测标准主表 Mapper 接口
@@ -19,4 +21,6 @@
public interface QualityTestStandardMapper extends BaseMapper<QualityTestStandard> {

    IPage<QualityTestStandard> qualityTestStandardListPage(Page page, @Param("c") QualityTestStandard qualityTestStandard);

    List<QualityTestStandard> getQualityTestStandardByProductId(@Param("productId") Long productId, @Param("inspectType") Integer inspectType, @Param("process") String process);
}

 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java

@@ -149,4 +149,7 @@
    //不合格现象
    private String defectivePhenomena;

    @ApiModelProperty("关联检测标准主表id")
    private Long testStandardId;

}

 src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java

@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;

import java.util.List;

/**
 * <p>
@@ -19,4 +22,5 @@

    int copyParam(QualityTestStandard qualityTestStandard);

    List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process);
}

 src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java

@@ -1,11 +1,16 @@
package com.ruoyi.quality.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,6 +42,9 @@
    @Autowired
    private QualityTestStandardParamService qualityTestStandardParamService;

    @Autowired
    private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;

    @Override
    public IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
        return qualityTestStandardMapper.qualityTestStandardListPage(page,qualityTestStandard);
@@ -52,11 +60,17 @@
        qualityTestStandardMapper.insert(testStandard);
        List<QualityTestStandardParam> newQualityTestStandardParams = oldQualityTestStandardParams.stream().map(oldQualityTestStandardParam -> {
            oldQualityTestStandardParam.setTestStandardId(testStandard.getId());
            oldQualityTestStandardParam.setId(null);
            return oldQualityTestStandardParam;
        }).collect(Collectors.toList());
        qualityTestStandardParamService.saveBatch(newQualityTestStandardParams);
        return 0;
    }

    @Override
    public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process) {
        return qualityTestStandardMapper.getQualityTestStandardByProductId(productId,inspectType,process);
    }


}

 src/main/resources/mapper/quality/QualityTestStandardMapper.xml

@@ -14,10 +14,21 @@
            AND standard_name like concat('%',#{c.standardName},'%')
        </if>
        <if test="c.state != null and c.state != '' ">
            AND state = #{c.state}
            AND state =#{c.state}
        </if>
        <if test="c.inspectType != null and c.inspectType != '' ">
            AND inspect_type = #{c.inspectType}
            AND inspect_type =#{c.inspectType}
        </if>
    </select>
    <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
        SELECT qts.*
        FROM quality_test_standard qts
                 left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
                 left join product_process pp on qts.process_id = pp.id
        WHERE qtsb.product_id = #{productId}
          AND qts.inspect_type = #{inspectType}
        <if test="process!='' and process!=null">
            and pp.name = #{process}
        </if>
    </select>
</mapper>