feat(quality): 添加不合格品处理标识字段

liyong

4 天以前 ce801368ab64803ce4dc88fcd7a401ade86e5d23

feat(quality): 添加不合格品处理标识字段

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

@@ -55,7 +55,7 @@
     */
    @GetMapping("/{id}")
    public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityUnqualifiedService.getById(id));
        return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
    }

    /**

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

@@ -17,4 +17,6 @@
    IPage<QualityUnqualified> qualityUnqualifiedListPage(Page page, @Param("qualityUnqualified") QualityUnqualified qualityUnqualified);

    List<QualityUnqualified> qualityUnqualifiedExport(@Param("qualityUnqualified") QualityUnqualified qualityUnqualified);

    QualityUnqualified getUnqualified(@Param("id") Integer id);
}

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

@@ -138,5 +138,6 @@


    @ApiModelProperty("是否不合格处理自己新增")
    @TableField(exist = false)
    private Boolean method;
}

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

@@ -17,4 +17,5 @@

    int deal(QualityUnqualified qualityUnqualified);

    QualityUnqualified getUnqualified(Integer id);
}

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

@@ -159,4 +159,9 @@
        qualityUnqualified.setInspectState(1);//已处理
        return qualityUnqualifiedMapper.updateById(qualityUnqualified);
    }

    @Override
    public QualityUnqualified getUnqualified(Integer id) {
        return qualityUnqualifiedMapper.getUnqualified(id);
    }
}

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

@@ -60,4 +60,33 @@
            AND product_name = #{qualityUnqualified.productName}
        </if>
    </select>
    <select id="getUnqualified" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
        SELECT
            qu.id,
            qu.inspect_type,
            qu.inspect_state,
            qu.check_time,
            qu.check_name,
            qu.product_id,
            qu.product_name,
            qu.unit,
            qu.quantity,
            qu.defective_phenomena,
            qu.deal_result,
            qu.deal_name,
            qu.deal_time,
            CASE
                WHEN qu.model = pm.id THEN pm.model
                ELSE qu.model
                END AS model,
            CASE
                WHEN qu.model = pm.id THEN true
                ELSE false
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.model = pm.id
        where
            1=1
        and qu.id = #{id}
    </select>
</mapper>