大屏统计优化

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabHazard.java

@@ -175,6 +175,9 @@ public class LabHazard extends BaseEntity implements HazardTypeInterface {
     @ApiModelProperty(value = "危险源类型（查看字典表lab_hazard_type）")
     private Integer hazardTypeMode;
 
+    @ApiModelProperty(value = "危险源类型名称（查看字典表lab_hazard_type）")
+    private String hazardTypeModeName;
+
     /**
      * 危险源和实验室关联信息
      */
@@ -376,4 +379,12 @@ public class LabHazard extends BaseEntity implements HazardTypeInterface {
     public void setHazardTypeMode(Integer hazardTypeMode) {
         this.hazardTypeMode = hazardTypeMode;
     }
+
+    public String getHazardTypeModeName() {
+        return hazardTypeModeName;
+    }
+
+    public void setHazardTypeModeName(String hazardTypeModeName) {
+        this.hazardTypeModeName = hazardTypeModeName;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/LabHazardNewVo.java

@@ -57,6 +57,9 @@ public class LabHazardNewVo implements QCInterface {
     @ApiModelProperty(value = "危险源类型（查看字典表lab_hazard_type）")
     private Integer hazardTypeMode;
 
+    @ApiModelProperty(value = "危险源类型名称（查看字典表lab_hazard_type）")
+    private String hazardTypeModeName;
+
     public Long getId() {
         return id;
     }
@@ -137,4 +140,12 @@ public class LabHazardNewVo implements QCInterface {
     public void setHazardTypeMode(Integer hazardTypeMode) {
         this.hazardTypeMode = hazardTypeMode;
     }
+
+    public String getHazardTypeModeName() {
+        return hazardTypeModeName;
+    }
+
+    public void setHazardTypeModeName(String hazardTypeModeName) {
+        this.hazardTypeModeName = hazardTypeModeName;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabHazardMapper.xml

@@ -36,6 +36,7 @@
         <result property="qrCodeUrl"    column="qr_code_url"    />
         <result property="scanCount"    column="scan_count"    />
         <result property="hazardTypeMode"    column="hazard_type_mode"    />
+        <result property="hazardTypeModeName"    column="hazard_type_mode_name"    />
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabHazardVO" id="LabHazardVoResult">
@@ -187,7 +188,8 @@
                b.hazard_id   as sub_hazard_id,
                b.subject_id  as sub_subject_id,
                b.create_time as sub_create_time,
-               a.hazard_type_mode
+               a.hazard_type_mode,
+               a.hazard_type_mode_name
         from lab_hazard a
                  left join lab_hazard_subject_relation b on b.hazard_id = a.id
         where a.id = #{id}
@@ -250,6 +252,7 @@
             <if test="content != null">content,</if>
             <if test="scanCount != null">scan_count,</if>
             <if test="hazardTypeMode != null">hazard_type_mode,</if>
+            <if test="hazardTypeModeName != null">hazard_type_mode_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="chName != null">#{chName},</if>
@@ -281,6 +284,7 @@
             <if test="content != null">#{content},</if>
             <if test="scanCount != null">#{scanCount},</if>
             <if test="hazardTypeMode != null">#{hazardTypeMode},</if>
+            <if test="hazardTypeModeName != null">#{hazardTypeModeName},</if>
         </trim>
     </insert>
 
@@ -316,6 +320,7 @@
             <if test="content != null">content = #{content},</if>
             <if test="scanCount != null">scan_count = #{scanCount},</if>
             <if test="hazardTypeMode != null">hazard_type_mode = #{hazardTypeMode},</if>
+            <if test="hazardTypeModeName != null">hazard_type_mode_name = #{hazardTypeModeName},</if>
         </trim>
         where id = #{id}
     </update>