Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

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

@@ -143,4 +143,7 @@

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;

    @Schema(description = "关联产品型号id")
    private Long productModelId;
}

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

@@ -121,6 +121,7 @@
            BeanUtils.copyProperties(qualityInspect, qualityUnqualified);
            qualityUnqualified.setInspectState(0);//待处理
            qualityUnqualified.setQuantity(qualityInspect.getUnqualifiedQuantity());
            qualityUnqualified.setProductModelId(qualityInspect.getProductModelId());
            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 + "这些指标中存在不合格");//不合格现象

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

@@ -84,7 +84,7 @@
                ELSE false
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.model = pm.id
                 LEFT JOIN product_model pm ON qu.product_model_id = pm.id
        where
            1=1
        and qu.id = #{id}