分析详情添加机型字段

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisGeneralFileVo.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -53,4 +52,9 @@ public class AnalysisGeneralFileVo {
      * 风机类型编号
      */
     private String engineTypeCode ;
+
+    /**
+     * 风机类型名称
+     */
+    private String machineTypeCode ;
 }

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisGeneralFileMapper.xml

@@ -19,10 +19,13 @@
         type.type_name as analysis_type_name,
         general.file_addr,
         general.engine_type_code,
-        general.create_time
+        general.create_time,
+        mill.machine_type_code
         from analysis_general_file general
         left join analysis_type type
         on type.type_code = general.analysis_type_code
+        left join wind_engine_mill mill
+        on mill.mill_type_code = general.engine_type_code
         where general.batch_code = #{batchCode,jdbcType=VARCHAR}
         <if test="analysisTypeCode != null and analysisTypeCode != ''">
             and general.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}