2022-08-26 化学品存放补全化学平名称字段。

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalJoinCabinetListVo.java

@@ -28,6 +28,10 @@ public class HxpChemicalJoinCabinetListVo {
     @ApiModelProperty(value = "化学品编号")
     private String joinNum;
 
+    @Excel(name = "化学品名称")
+    @ApiModelProperty(value = "化学品名称")
+    private String chemicalName;
+
     @Excel(name = "规格")
     @ApiModelProperty(value = "规格")
     private String chemicalAmountUnit;
@@ -89,6 +93,14 @@ public class HxpChemicalJoinCabinetListVo {
         this.joinNum = joinNum;
     }
 
+    public String getChemicalName() {
+        return chemicalName;
+    }
+
+    public void setChemicalName(String chemicalName) {
+        this.chemicalName = chemicalName;
+    }
+
     public String getChemicalAmountUnit() {
         return chemicalAmountUnit;
     }

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpChemicalJoinCabinetMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t.id,t.join_num,t.sub_id, t.chemical_id, t.cabinet_id,t.chemical_amount,t.chemical_amount_unit,t.expire_time, t.user_id, t.create_by, t.create_time,t.status from hxp_chemical_join_cabinet as t
     </sql>
     <select id="selectHxpChemicalJoinCabinetList" parameterType="com.zd.chemical.domain.vo.HxpChemicalJoinCabinetSearch" resultType="com.zd.chemical.domain.vo.HxpChemicalJoinCabinetListVo">
-        SELECT cjc.`id`,cjc.`join_num` joinNum,IFNULL(CONCAT(cjc.chemical_amount,cjc.`chemical_amount_unit`),'') chemicalAmountUnit,cjc.expire_time expireTime,ct.cabinet_name cabinetName,
+        SELECT cjc.`id`,cjc.`join_num` joinNum,cl.chemical_name chemicalName,IFNULL(CONCAT(cjc.chemical_amount,cjc.`chemical_amount_unit`),'') chemicalAmountUnit,cjc.expire_time expireTime,ct.cabinet_name cabinetName,
         (SELECT he.name FROM lab_hardware he WHERE he.id = cjc.cabinetlock_id) lockName,
         CONCAT((SELECT st.name FROM lab_subject st WHERE st.id = ct.`sub_id`),'-',(SELECT dt.dept_name FROM sys_dept dt,lab_subject st WHERE dt.dept_id = st.build_id AND st.id = ct.`sub_id`),
         '-',(SELECT bg.name FROM lab_building bg,lab_subject st WHERE bg.id = st.floor_id AND st.id = ct.`sub_id`),'-',(SELECT slt.room FROM lab_subject_layout slt,lab_subject st WHERE slt.id = st.layout_id AND st.id = ct.`sub_id`)) posi,