Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-a...

chenrui

2025-04-08 ba5bd31ecf829d2b462bd3f62b566828b347a89a

Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency

 basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java

@@ -24,6 +24,10 @@
    // 对象英文
    private String sampleTypeEn;

    private String workShopName;

    private Integer workShopId;

    private List<SampleDto> children;

}

 basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java

@@ -11,6 +11,8 @@

    private String name;

    private String labelName;

    private List<ProductDto> children;

}

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java

@@ -296,7 +296,7 @@
        // 对检测对象先按照实验室在按照检查对象类别分类
        List<BasicTreeDto> testProjectBasicTreeList = structureTestObjectList.stream().map(structureTestObject -> {
            BasicTreeDto basicTreeDto = new BasicTreeDto();
            basicTreeDto.setValue(structureTestObject.getSpecimenName() + "(" + structureTestObject.getObjectType() + ")");
            basicTreeDto.setValue(structureTestObject.getSpecimenName());
            basicTreeDto.setLabel(structureTestObject.getSpecimenName() + "(" + structureTestObject.getObjectType() + ")");
            basicTreeDto.setLevel(BasicTreeEnums.STRUCTURE_TEST_OBJECT_TYPE.getCode());
            List<BasicTreeDto> children = new ArrayList<>();

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

@@ -35,6 +35,8 @@
        <result property="sort" column="sort"/>
        <result property="partNo" column="part_no"/>
        <result property="sampleTypeEn" column="sample_type_en"/>
        <result property="workShopName" column="workShopName"/>
        <result property="workShopId" column="workShopId"/>
        <collection property="children" resultMap="SampleDto"/>
    </resultMap>

@@ -99,12 +101,15 @@
               sto.id  sample_type_id,
               sto.sort,
               sto.specimen_name_en sample_type_en,
               p.name_en sample_en
               p.name_en sample_en,
               ws.`name` workShopName,
               ws.id workShopId
        from laboratory l
                 left join structure_test_object sto on sto.laboratory_id = l.id
                 left join product p on p.object_id = sto.id
                 left join standard_tree st on st.sample_type = sto.specimen_name
            and st.sample = p.name
                 LEFT JOIN work_shop ws ON ws.id = sto.work_shop_id
        order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
    </select>

@@ -249,7 +254,9 @@
               l.laboratory_name  laboratory,
               sto.specimen_name  sample_type,
               p.name             sample,
               st.model,
               m.model_name  model,
               ws.`name` workShopName,
               ws.id workShopId,
               CASE
                   WHEN p.id = (SELECT pp.product_id
                                FROM product_part pp
@@ -269,6 +276,8 @@
                 left join product p on p.object_id = sto.id
                 left join standard_tree st on st.sample_type = sto.specimen_name
            and st.sample = p.name
                 LEFT JOIN model m ON m.product_id = p.id
                 LEFT JOIN work_shop ws ON ws.id = sto.work_shop_id
        where (p.id = (select pp.product_id
                       from product_part pp
                       where pp.part_no = #{partNo})

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

@@ -177,6 +177,7 @@
    <select id="getItemTree" resultMap="itemDto">
        SELECT
            sto.id AS sId,
            sto.specimen_name AS labelName,
            CONCAT(sto.specimen_name, ' (', sto.object_type, ')') AS sName,
            p.id AS pId,
            p.name AS pName,
@@ -191,6 +192,7 @@
    <resultMap id="itemDto" type="com.ruoyi.basic.dto.TestItemDto">
        <result column="sId" property="id"/>
        <result column="sName" property="name"/>
        <result column="labelName" property="labelName"/>
        <collection property="children" resultMap="productDto"/>
    </resultMap>
    <resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">

 inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java

@@ -32,4 +32,10 @@
    @ApiModelProperty("型号")
    private List<ModelDto> children2;

    @ApiModelProperty("车间名称")
    private String workShopName;

    @ApiModelProperty("车间id")
    private Integer workShopId;

}

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java

@@ -103,6 +103,8 @@
                        rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
                        rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
                        rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
                        rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
                        rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
                    } else {
                        for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
                            if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
@@ -115,6 +117,8 @@
                                rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
                                rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
                                rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
                                rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
                                rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
                            }
                        }
                    }