质检新增检验用粉剂/液ID及规格型号ID

yuan

2 天以前 5a44cc19254b49329c33bbe82446764cdcc6a7d5

质检新增检验用粉剂/液ID及规格型号ID

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

@@ -123,6 +123,16 @@
    private String inspectMaterialCondition;

    /**
     * 检验用粉剂/液情况 产品ID
     */
    private Long inspectMaterialConditionId;

    /**
     * 检验用粉剂/液规格型号IDa
     */
    private Long inspectProductModelId;

    /**
     * 有效期（计算字段：生产日期+有效期）
     */
    @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -446,16 +446,16 @@
    <select id="selectOneData" resultType="com.ruoyi.quality.pojo.QualityInspect">
        select *,
               case
                   when inspect_material_condition = '检验用液剂情况' then
                       '☐'
                   else
                   when inspect_material_condition = '检验用粉剂' then
                       '☑'
                   else
                       '☐'
                   end as inspect_material_condition_a,
               case
                   when inspect_material_condition = '检验用粉剂情况' then
                       '☐'
                   else
                   when inspect_material_condition = '检验用液剂' then
                       '☑'
                   else
                       '☐'
                   end as inspect_material_condition_b
        from quality_inspect
        where id = #{id};

 src/main/resources/static/out-report-template.docx

Binary files differ