Merge remote-tracking branch 'origin/master'

value

2023-08-31 c0bbd3356de42175a4bf956d37e85bf74c169d4b

Merge remote-tracking branch 'origin/master'

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java

@@ -64,7 +64,7 @@
    private Integer inspectionMaterialId;

    /**
     *  æ£€éªŒå‘˜
     *  è´£ä»»äºº
     **/
    @JsonSerialize
    private String userName;

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java

@@ -254,8 +254,8 @@
                insProductVo.setInstrumentName(equipmentName);
            }
            //获取用户名(前提是如果存在)
            if (insProduct.getUserId() != null) {
                String userName = userMapper.selectById(insProduct.getUserId()).getName();
            if (insProduct.getUserProId() != null) {
                String userName = userMapper.selectById(insProduct.getUserProId()).getName();
                insProductVo.setUserName(userName);
            }
            //项目关联物料id

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.ClassAndInsTree;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -26,5 +27,5 @@
    //分配-->选择设备
    List<Map<String, Object>> chooseinstum();

    List<Map<String, String>> getInstrument();
    List<ClassAndInsTree> getInstrument();
}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/ClassAndIns.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.yuanchu.limslaboratory.pojo;

import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @Author å¼ å®¾
 * @Date 2023/8/31
 */
@Data
public class ClassAndIns implements Serializable {

    private Integer sonId;

    private String sonName;

    List<Ins> childrenList;
}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/ClassAndInsTree.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.yuanchu.limslaboratory.pojo;

import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @Author å¼ å®¾
 * @Date 2023/8/31
 */
@Data
public class ClassAndInsTree implements Serializable {

    private Integer fatherId;

    private String fatherName;

    List<ClassAndIns> childrenList;

}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Ins.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.yuanchu.limslaboratory.pojo;

import lombok.Data;

import java.io.Serializable;

/**
 * @Author å¼ å®¾
 * @Date 2023/8/31
 */
@Data
public class Ins implements Serializable {

    private Integer insId;

    private String name;

}

 laboratory-server/src/main/resources/mapper/InstrumentMapper.xml

@@ -37,16 +37,49 @@
        <result property="name" column="name"/>
    </resultMap>
    <select id="chooseinstum" resultMap="chooseinstumMap">
        select c.id cid,
            instrument.id,
               father_name ,
               son_name ,
        select c.id           cid,
               instrument.id,
               father_name,
               son_name,
               equipment_name name
        from lims_laboratory.instrument
                 left join lims_laboratory.classify c on c.id = instrument.classify_id
        where conditions in(1,5)
        where conditions in (1, 5)
    </select>
    <select id="getInstrument" resultType="map">
        select id,equipment_name equipmentName from instrument  where 1=1  and state=1 and conditions=5
    <select id="getInstrument" resultMap="treeMapClassAndInstrument">
        SELECT
            *
        FROM
            classify f,(
            SELECT
                cl.id cId,
                cl.son_name cSonName,
                cl.father_name cFatherName,
                i.id iId,
                equipment_name equipmentName
            FROM
                classify cl,
                instrument i
            WHERE
                i.classify_id = cl.id
              AND i.state = 1
              AND conditions = 5
        ) s
        WHERE
            f.father_name = s.cFatherName
          AND f.son_name IS NULL
    </select>

    <resultMap id="treeMapClassAndInstrument" type="com.yuanchu.limslaboratory.pojo.ClassAndInsTree" >
        <result property="fatherId" column="id"/>
        <result property="fatherName" column="father_name"/>
        <collection property="childrenList" ofType="classAndIns">
            <result property="sonId" column="cId"/>
            <result property="sonName" column="cSonName"/>
            <collection property="childrenList" ofType="ins">
                <result property="insId" column="iId"/>
                <result property="name" column="equipmentName"/>
            </collection>
        </collection>
    </resultMap>
</mapper>