fix

meas-system/src/main/java/com/meas/system/domain/MeasDataResults.java

@@ -30,7 +30,7 @@ public class MeasDataResults extends BaseEntity {
     /**
      * 发动机型号
      */
-    private String model;
+    private String engineModel;
 
     /**
      * 几何模型文件
@@ -97,12 +97,12 @@ public class MeasDataResults extends BaseEntity {
         this.measurementBatchId = measurementBatchId;
     }
 
-    public String getModel() {
-        return model;
+    public String getEngineModel() {
+        return engineModel;
     }
 
-    public void setModel(String model) {
-        this.model = model;
+    public void setEngineModel(String engineModel) {
+        this.engineModel = engineModel;
     }
 
     public String getGeometryFiles() {
@@ -182,7 +182,7 @@ public class MeasDataResults extends BaseEntity {
         return "MeasDataResults{" +
                 "id=" + id +
                 ", measurementBatchId='" + measurementBatchId + '\'' +
-                ", model='" + model + '\'' +
+                ", engineModel='" + engineModel + '\'' +
                 ", geometryFiles='" + geometryFiles + '\'' +
                 ", geometryImage='" + geometryImage + '\'' +
                 ", measurementBatch='" + measurementBatch + '\'' +

meas-system/src/main/java/com/meas/system/domain/MeasEnvData.java

@@ -32,7 +32,7 @@ public class MeasEnvData extends BaseEntity {
 //  测量批次号
     private String measurementBatch;
 //  发动机号
-    private String model;
+    private String engineModel;
     /**
      * 几何模型文件
      */
@@ -223,12 +223,12 @@ public class MeasEnvData extends BaseEntity {
         this.measurementBatch = measurementBatch;
     }
 
-    public String getModel() {
-        return model;
+    public String getEngineModel() {
+        return engineModel;
     }
 
-    public void setModel(String model) {
-        this.model = model;
+    public void setEngineModel(String engineModel) {
+        this.engineModel = engineModel;
     }
 
     public String getGeometryFiles() {
@@ -253,7 +253,7 @@ public class MeasEnvData extends BaseEntity {
                 "id=" + id +
                 ", measurementBatchId=" + measurementBatchId +
                 ", measurementBatch='" + measurementBatch + '\'' +
-                ", model='" + model + '\'' +
+                ", engineModel='" + engineModel + '\'' +
                 ", geometryFiles='" + geometryFiles + '\'' +
                 ", geometryImage='" + geometryImage + '\'' +
                 ", engineStatus='" + engineStatus + '\'' +

meas-system/src/main/resources/mapper/meas/MeasDataResultsMapper.xml

@@ -7,7 +7,7 @@
     <resultMap type="MeasDataResults" id="MeasDataResultsResult">
         <result property="id" column="id"/>
         <result property="measurementBatchId" column="measurement_batch_id"/>
-        <result property="model" column="model"/>
+        <result property="engineModel" column="engine_model"/>
         <result property="geometryFiles" column="geometry_files"/>
         <result property="geometryImage" column="geometry_image"/>
         <result property="measurementBatch" column="measurement_batch"/>
@@ -27,7 +27,7 @@
         SELECT
             mdr.id,
             med.id measurement_batch_id,
-            mem.model,
+            mem.model engine_model
             mem.geometry_files,
             mem.geometry_image,
             mb.measurement_batch,
@@ -51,12 +51,12 @@
     <select id="selectMeasDataResultsList" parameterType="MeasDataResults" resultMap="MeasDataResultsResult">
         <include refid="selectMeasDataResultsVo"/>
         <where>
-            <if test="measurementBatch != null  and measurementBatch != ''">and mdr.measurement_batch = #{measurementBatch}</if>
-            <if test="model != null  and model != ''">and med.model =
-                #{model}
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch = #{measurementBatch}</if>
+            <if test="engineModel != null  and engineModel != ''">and mem.model =
+                #{engineModel}
             </if>
-            <if test="engineStatus != null  and engineStatus != ''">and mdr.engine_status = #{engineStatus}</if>
-            <if test="angle != null  and angle != ''">and mdr.angle = #{angle}</if>
+            <if test="engineStatus != null  and engineStatus != ''">and med.engine_status = #{engineStatus}</if>
+            <if test="angle != null  and angle != ''">and med.angle = #{angle}</if>
             <if test="specIrr2 != null  and specIrr2 != ''">and mdr.spec_irr_2 = #{specIrr2}</if>
             <if test="specBandIrr1 != null ">and mdr.spec_band_irr_1 = #{specBandIrr1}</if>
             <if test="specBandIrr2 != null ">and mdr.spec_band_irr_2 = #{specBandIrr2}</if>

meas-system/src/main/resources/mapper/meas/MeasEnvDataMapper.xml

@@ -8,7 +8,7 @@
         <result property="id" column="id"/>
         <result property="measurementBatchId" column="measurement_batch_id"/>
         <result property="measurementBatch" column="measurement_batch"/>
-        <result property="model" column="model"/>
+        <result property="engineModel" column="engine_model"/>
         <result property="geometryFiles" column="geometry_files"/>
         <result property="geometryImage" column="geometry_image"/>
         <result property="engineStatus" column="engine_status"/>
@@ -33,7 +33,7 @@
             med.id,
             med.measurement_batch_id,
             mb.measurement_batch,
-            mem.model,
+            mem.model engine_model
             mem.geometry_files,
             mem.geometry_image,
             med.engine_status,
@@ -61,7 +61,9 @@
         <include refid="selectMeasEnvDataVo"/>
         <where>
             <if test="measurementBatchId != null ">and measurement_batch_id = #{measurementBatchId}</if>
-            <if test="engineStatus != null  and engineStatus != ''">and engine_status = #{engineStatus}</if>
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch = #{measurementBatch}</if>
+            <if test="engineModel != null  and engineModel != ''">and mem.model = #{engineModel}</if>
+            <if test="engineStatus != null and engineStatus != ''">and engine_status = #{engineStatus}</if>
             <if test="angle != null  and angle != ''">and angle = #{angle}</if>
             <if test="turbinePostTemp != null ">and turbine_post_temp = #{turbinePostTemp}</if>
             <if test="testDistance != null ">and test_distance = #{testDistance}</if>

meas-system/src/main/resources/mapper/meas/MeasSpectralRadiationMapper.xml

@@ -11,7 +11,7 @@
         <result property="geometryFiles" column="geometry_files"/>
         <result property="geometryImage" column="geometry_image"/>
         <result property="measurementBatch" column="measurement_batch"/>
-        <result property="engineStatus" column="measurement_batch"/>
+        <result property="engineStatus" column="engine_status"/>
         <result property="angle" column="angle"/>
         <result property="model" column="model"/>
         <result property="lensFView" column="lens_f_view"/>
@@ -63,15 +63,14 @@
         <include refid="selectMeasSpectralRadiationVo"/>
         <where>
 
-            <if test="measurementBatch != null  and measurementBatch != ''">and mdr.measurement_batch = #{measurementBatch}</if>
-            <if test="engineModel != null  and engineModel != ''">and med.model =
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch = #{measurementBatch}</if>
+            <if test="engineModel != null  and engineModel != ''">and mem.model =
                 #{engineModel}
             </if>
-            <if test="engineStatus != null  and engineStatus != ''">and mdr.engine_status = #{engineStatus}</if>
-            <if test="angle != null  and angle != ''">and mdr.angle = #{angle}</if>
-
+            <if test="engineStatus != null  and engineStatus != ''">and med.engine_status = #{engineStatus}</if>
+            <if test="angle != null  and angle != ''">and med.angle = #{angle}</if>
             <if test="measurementBatchId != null ">and measurement_batch_id = #{measurementBatchId}</if>
-            <if test="model != null  and model != ''">and model = #{model}</if>
+            <if test="model != null  and model != ''">and msr.model = #{model}</if>
             <if test="lensFView != null ">and lens_f_view = #{lensFView}</if>
             <if test="gain != null ">and gain = #{gain}</if>
             <if test="backgroundData != null  and backgroundData != ''">and background_data = #{backgroundData}</if>

meas-system/src/main/resources/mapper/meas/MeasThermalImagerTestDataMapper.xml

@@ -11,7 +11,7 @@
         <result property="geometryFiles" column="geometry_files"/>
         <result property="geometryImage" column="geometry_image"/>
         <result property="measurementBatch" column="measurement_batch"/>
-        <result property="engineStatus" column="measurement_batch"/>
+        <result property="engineStatus" column="engine_status"/>
         <result property="angle" column="angle"/>
         <result property="model" column="model"/>
         <result property="lensFView" column="lens_f_view"/>
@@ -65,7 +65,13 @@
         <include refid="selectMeasThermalImagerTestDataVo"/>
         <where>
             <if test="measurementBatchId != null ">and measurement_batch_id = #{measurementBatchId}</if>
-            <if test="model != null  and model != ''">and model = #{model}</if>
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch = #{measurementBatch}</if>
+            <if test="engineModel != null  and engineModel != ''">and mem.model =
+                #{engineModel}
+            </if>
+            <if test="engineStatus != null and engineStatus != ''">and med.engine_status = #{engineStatus}</if>
+            <if test="angle != null  and angle != ''">and med.angle = #{angle}</if>
+            <if test="model != null  and model != ''">and mtitd.model = #{model}</if>
             <if test="lensFView != null  and lensFView != ''">and lens_f_view = #{lensFView}</if>
             <if test="filterNo != null  and filterNo != ''">and filter_no = #{filterNo}</if>
             <if test="fps != null  and fps != ''">and fps = #{fps}</if>

meas-system/src/main/resources/mapper/meas/MeasTransmissionRateMapper.xml

@@ -11,7 +11,7 @@
         <result property="geometryFiles" column="geometry_files"/>
         <result property="geometryImage" column="geometry_image"/>
         <result property="measurementBatch" column="measurement_batch"/>
-        <result property="engineStatus" column="measurement_batch"/>
+        <result property="engineStatus" column="engine_status"/>
         <result property="angle" column="angle"/>
         <result property="rawData" column="raw_data"/>
         <result property="curve1" column="curve_1"/>
@@ -51,6 +51,12 @@
         <include refid="selectMeasTransmissionRateVo"/>
         <where>
             <if test="measurementBatchId != null ">and measurement_batch_id = #{measurementBatchId}</if>
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch = #{measurementBatch}</if>
+            <if test="engineModel != null  and engineModel != ''">and mem.model =
+                #{engineModel}
+            </if>
+            <if test="engineStatus != null and engineStatus != ''">and med.engine_status = #{engineStatus}</if>
+            <if test="angle != null  and angle != ''">and med.angle = #{angle}</if>
             <if test="rawData != null  and rawData != ''">and raw_data = #{rawData}</if>
             <if test="curve1 != null  and curve1 != ''">and curve_1 = #{curve1}</if>
             <if test="curve2 != null  and curve2 != ''">and curve_2 = #{curve2}</if>