增加检验项分类

value

2024-06-06 762c419bb29a48557b7bf18cc3bf9c84309bc90e

增加检验项分类

 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java

@@ -67,7 +67,7 @@
    @ApiModelProperty(value = "计量单位")
    private String unit;

    @ValueTableShow(15)
    @ValueTableShow(18)
    @ApiModelProperty(value = "试验方法")
    private String method;

@@ -129,5 +129,13 @@
    @ApiModelProperty(value = "字典类型")
    private String dic;

    @ValueTableShow(16)
    @ApiModelProperty(value = "检验项分类")
    private String inspectionItemClass;

    @ValueTableShow(17)
    @ApiModelProperty(value = "检验项分类EN")
    private String inspectionItemClassEn;

}


 cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml

@@ -33,7 +33,9 @@
        template_id,
        son_laboratory,
        ask,
        ask_tell
        ask_tell,
        inspection_item_class,
        inspection_item_class_en
        from structure_item_parameter
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java

@@ -24,7 +24,7 @@

    int updateInspected(@Param("id") Integer id);

    List<InsProduct> selectFiberInsProduct(List<Integer> ids);
    List<InsProduct> selectFiberInsProduct(List<Integer> ids, String laboratory);
}



 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java

@@ -35,7 +35,11 @@
    /**
     * 检验项分类
     */
    private String inspectionItemClassify;
    @ApiModelProperty(value = "检验项分类")
    private String inspectionItemClass;

    @ApiModelProperty(value = "检验项分类EN")
    private String inspectionItemClassEn;

    /**
     * 检验项子类

 inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java

@@ -182,4 +182,10 @@
    private String tree;

    private Integer structureItemParameterId;

    @ApiModelProperty(value = "检验项分类")
    private String inspectionItemClass;

    @ApiModelProperty(value = "检验项分类EN")
    private String inspectionItemClassEn;
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -931,7 +931,7 @@
        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
        List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult).isNull(InsProduct::getInsFiberId).isNull(InsProduct::getInsFibersId));
        insProducts.addAll(insProductMapper.selectFiberInsProduct(ids));
        insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
        if (insProducts.size() > 0) {
            String str = "";
            int count = 0;

 inspect-server/src/main/resources/mapper/InsProductMapper.xml

@@ -92,8 +92,9 @@
        where state = 1
        and (ins_fibers_id is not null or ins_fiber_id is not null)
        and ins_result is null
        and son_laboratory = #{laboratory}
        and ins_sample_id in
        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
        <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
            #{item}
        </foreach>
    </select>

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -114,7 +114,8 @@
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -163,7 +164,8 @@
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -220,9 +222,10 @@
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               ip.factory ip_factory,
               ip.laboratory ip_laboratory,
               ip.sample_type ip_sample_type,
@@ -266,7 +269,6 @@
        select ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -317,7 +319,8 @@
        select ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -366,7 +369,8 @@
        select ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -440,9 +444,10 @@
        <id property="id" column="ip_id" jdbcType="INTEGER"/>
        <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
        <result property="inspectionItemEn" column="inspection_item_en" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclassEn" column="inspection_item_subclass_en" jdbcType="VARCHAR"/>
        <result property="inspectionItemClass" column="inspection_item_class" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassEn" column="inspection_item_class_en" jdbcType="VARCHAR"/>
        <result property="factory" column="ip_factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="ip_laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="ip_sample_type" jdbcType="VARCHAR"/>

 inspect-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -137,6 +137,8 @@
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               method,
               son_laboratory,
               unit,
@@ -174,6 +176,8 @@
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               method,
               son_laboratory,
               unit,
@@ -215,6 +219,8 @@
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               method,
               son_laboratory,
               unit,