1老化标检单导出调整

zhmes-agecal-admin/src/main/java/com/zehong/web/controller/equipment/ProductStandardInspectionController.java

@@ -50,7 +50,7 @@ public class ProductStandardInspectionController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(ProductStandardInspection productStandardInspection)
     {
-        List<ProductStandardInspection> list = productStandardInspectionService.selectProductStandardInspectionList(productStandardInspection);
+        List<ProductStandardInspection> list = productStandardInspectionService.exportProductStandardInspectionList(productStandardInspection);
         ExcelUtil<ProductStandardInspection> util = new ExcelUtil<ProductStandardInspection>(ProductStandardInspection.class);
         return util.exportExcel(list, "产品主体标检单数据");
     }

zhmes-agecal-system/src/main/java/com/zehong/system/domain/ProductStandardInspection.java

@@ -5,6 +5,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 产品主体标检单对象 t_product_standard_inspection
  *
@@ -15,6 +18,12 @@ public class ProductStandardInspection extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /**状态*/
+    private static Map<String,String> plateTypeMap = new HashMap<String,String>(){{
+        put("1","主体");
+        put("2","主板");
+    }};
+
     /** id */
     private Long productStandardInspectionId;
 
@@ -89,6 +98,10 @@ public class ProductStandardInspection extends BaseEntity
     @Excel(name = "板件类型")
     private String plateType;
 
+    /** 板件类型：1.主体 2.主板*/
+    private String plateTypeStr;
+
+
     /** 确认标检人 */
     @Excel(name = "确认标检人")
     private String confirmQualityInspector;
@@ -284,6 +297,13 @@ public class ProductStandardInspection extends BaseEntity
         this.plateType = plateType;
     }
 
+    public String getPlateTypeStr() {
+        return plateTypeMap.get(this.plateType);
+    }
+
+    public void setPlateTypeStr(String plateTypeStr) {
+        this.plateTypeStr = plateTypeStr;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

zhmes-agecal-system/src/main/java/com/zehong/system/mapper/ProductStandardInspectionMapper.java

@@ -33,6 +33,8 @@ public interface ProductStandardInspectionMapper
      */
     public List<ProductStandardInspection> selectProductStandardInspectionList(ProductStandardInspection productStandardInspection);
 
+    public List<ProductStandardInspection> exportExcel(ProductStandardInspection productStandardInspection);
+
     public List<ProductStandardInspection> selectDuringStandardInspection();
     /**
      * 新增产品主体标检单

zhmes-agecal-system/src/main/java/com/zehong/system/service/IProductStandardInspectionService.java

@@ -27,6 +27,8 @@ public interface IProductStandardInspectionService
      */
     public List<ProductStandardInspection> selectProductStandardInspectionList(ProductStandardInspection productStandardInspection);
 
+    public List<ProductStandardInspection> exportProductStandardInspectionList(ProductStandardInspection productStandardInspection);
+
     public List<ProductStandardInspection> selectDuringStandardInspection();
 
     /**

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/ProductStandardInspectionServiceImpl.java

@@ -69,6 +69,11 @@ public class ProductStandardInspectionServiceImpl implements IProductStandardIns
         return productStandardInspectionMapper.selectProductStandardInspectionList(productStandardInspection);
     }
 
+    @Override
+    public List<ProductStandardInspection> exportProductStandardInspectionList(ProductStandardInspection productStandardInspection) {
+        return productStandardInspectionMapper.exportExcel(productStandardInspection);
+    }
+
     /**
      * 查询产品主体标检单列表
      *

zhmes-agecal-system/src/main/resources/mapper/system/ProductStandardInspectionMapper.xml

@@ -31,6 +31,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProductStandardInspectionVo">
+        select f_product_standard_inspection_id, f_out_store_order_number, f_product_standard_inspection_number,
+               f_confirm_quality_inspector, f_remarks, f_status, f_create_by, f_inspection_dep, f_create_time,
+               f_delete_flag, f_material_name, f_material_code, f_specification, f_issued_num, f_quantity,
+               f_qualified_num, f_un_qualified_num, f_aging_duration, f_calibration_gas, f_alarm_value, f_range ,
+               f_reading_mode,f_plate_type
+        from t_product_standard_inspection
+    </sql>
+
+    <sql id="exportProductStandardInspectionVo">
         select f_product_standard_inspection_id, f_out_store_order_number, f_product_standard_inspection_number,
                f_confirm_quality_inspector, f_remarks, f_status, f_create_by, f_inspection_dep, f_create_time,
                f_delete_flag, f_material_name, f_material_code, f_specification, f_issued_num, f_quantity,
@@ -39,11 +48,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             case when  f_plate_type = '1' then '主体' else '主板' end as f_plate_type
         from t_product_standard_inspection
     </sql>
-
     <select id="selectDuringStandardInspection" resultMap="ProductStandardInspectionResult">
         <include refid="selectProductStandardInspectionVo"/>
         where f_status = 'DURING_STANDARD_INSPECTION'
     </select>
+    <select id="exportExcel" parameterType="ProductStandardInspection" resultMap="ProductStandardInspectionResult">
+        <include refid="exportProductStandardInspectionVo"/>
+        <if test="outStoreOrderNumber != null  and outStoreOrderNumber != ''"> and f_out_store_order_number = #{outStoreOrderNumber}</if>
+            <if test="productStandardInspectionNumber != null  and productStandardInspectionNumber != ''"> and f_product_standard_inspection_number = #{productStandardInspectionNumber}</if>
+    </select>
     <select id="selectProductStandardInspectionList" parameterType="ProductStandardInspection" resultMap="ProductStandardInspectionResult">
         <include refid="selectProductStandardInspectionVo"/>
         <where>

zhmes-agecal-web/src/views/standardInspection/index.vue

@@ -125,7 +125,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="板件类型" align="center" prop="plateType" />
+      <el-table-column label="板件类型" align="center" prop="plateTypeStr" />
     </el-table>
 
     <pagination