修改完善2

yaowanxin

5 天以前 600128eb020f4d162c27798d96b955406081855b

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

@@ -64,22 +64,6 @@
            qualityInspectParam.setInspectId(qualityInspect.getId());
        }
        qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
//        String[] ignoreProperties = {"id"};//排除id属性
//        //根据产品id查询指标维护对应新增检验参数
//        List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
//                .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
//        if (qualityTestStandards.size()>0){
//
//            List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
//                QualityInspectParam qualityInspectParam = new QualityInspectParam();
//                BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
//                qualityInspectParam.setInspectId(qualityInspect.getId());
//                return qualityInspectParam;
//            }).collect(Collectors.toList());
//            qualityInspectParamService.saveBatch(qualityInspectParams);
//        }else{
//            throw new BaseException("该产品没有维护检验指标,请检查!!!!!!!!");
//        }
        return 0;
    }

@@ -95,14 +79,14 @@

    //提交
    @Override
    public int submit(Integer id) {
        QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
    public int submit(QualityInspect inspect) {
        QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
        /*判断不合格*/
        if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && qualityInspect.getCheckResult().equals("不合格")){
            QualityUnqualified qualityUnqualified = new QualityUnqualified();
            BeanUtils.copyProperties(qualityInspect,qualityUnqualified);
            qualityUnqualified.setInspectState(0);//待处理
            List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
            List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
            String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
            qualityUnqualified.setDefectivePhenomena(text+"这些指标中存在不合格");//不合格现象
            qualityUnqualifiedMapper.insert(qualityUnqualified);
@@ -113,8 +97,8 @@

    /*生成检验报告*/
    @Override
    public void down(HttpServletResponse response, Integer id) {
        QualityInspect inspect = qualityInspectMapper.selectById(id);
    public void down(HttpServletResponse response, QualityInspect qualityInspect) {
        QualityInspect inspect = qualityInspectMapper.selectById(qualityInspect.getId());
        String inspectType="";
        switch (inspect.getInspectType()){
            case 0:
@@ -127,7 +111,7 @@
                inspectType="出厂检验";
                break;
        }
        List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
        List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
        int index = 1;
        for (QualityInspectParam detail : paramList) {
            detail.setIndex(index);
@@ -149,6 +133,7 @@
            response.setContentType("application/msword");
            String fileName = URLEncoder.encode(
                    "检验报告", "UTF-8");
            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
            response.setHeader("Content-disposition",
                    "attachment;filename=" + fileName + ".docx");
            OutputStream os = response.getOutputStream();
@@ -164,32 +149,16 @@

    @Override
    public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
        if (qualityInspectDto.getQualityInspectParams().size()>0) {
            qualityInspectParamService.updateBatchById(qualityInspectDto.getQualityInspectParams());
        if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
            qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId,qualityInspectDto.getId()));
            for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
                qualityInspectParam.setInspectId(qualityInspectDto.getId());
            }
            qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
        }
        QualityInspect qualityInspect = new QualityInspect();
        BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
        return qualityInspectMapper.updateById(qualityInspect);

//        String[] ignoreProperties = {"id"};//排除id属性
//        //先删除所有检验参数再新增
//        qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
//                .eq(QualityInspectParam::getInspectId,qualityInspect.getId()));
//        //根据产品id查询指标维护对应新增检验参数
//        List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
//                .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
//        if (qualityTestStandards.size()>0){
//            List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
//                QualityInspectParam qualityInspectParam = new QualityInspectParam();
//                BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
//                qualityInspectParam.setInspectId(qualityInspect.getId());
//                return qualityInspectParam;
//            }).collect(Collectors.toList());
//            qualityInspectParamService.saveBatch(qualityInspectParams);
//        }else{
//            throw new BaseException("该产品没有维护检验指标,请检查!!!!!!!!");
//        }
//        return  qualityInspectMapper.updateById(qualityInspect);
    }

    @Override