添加设备ID字段，相应API修改

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PlanReport.java

@@ -57,6 +57,9 @@ public class PlanReport extends BaseEntity {
     @TableField("drill_equip")
     private String drillEquip;
 
+    @TableField("drill_equip_id")
+    private String drillEquipId;
+
     @TableField(exist = false)
     private Integer pageNumber;
 

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanReportMapper.xml

@@ -20,11 +20,12 @@
         `biz_org_name`,
         `biz_org_code`,
         `drill_type`,
-        `drill_equip`
+        `drill_equip`,
+        `drill_equip_id`
     )
     VALUES
         (
-        #{id},#{batchNo},#{reportUrl},#{title},#{createDate},#{drillDate},#{address},#{compere},#{attendPerson},#{drillTopic},#{handleProcess},#{drillSummary},#{examineResult},#{bizOrgName}, #{bizOrgCode}, #{drillType},#{drillEquip}
+        #{id},#{batchNo},#{reportUrl},#{title},#{createDate},#{drillDate},#{address},#{compere},#{attendPerson},#{drillTopic},#{handleProcess},#{drillSummary},#{examineResult},#{bizOrgName}, #{bizOrgCode}, #{drillType},#{drillEquip}, #{drillEquipId}
         )
     </insert>
 
@@ -37,10 +38,9 @@
         count( 1 )
     FROM
         c_plan_report a
-    LEFT JOIN f_equipment b on b.id = a.drill_equip
     <where>
-        <if test="drillEquip != null and drillEquip != ''">
-            a.drill_equip = #{drillEquip}
+        <if test="drillEquipId != null and drillEquipId != ''">
+            a.drill_equip_id = #{drillEquipId}
         </if>
         <if test="drillType != null and drillType != ''">
             AND a.drill_type = #{drillType}
@@ -59,14 +59,12 @@
 
 <select id="getByPage" resultType="com.yeejoin.amos.fas.dao.entity.PlanReport">
     SELECT
-    a.*,
-    b.name as equipName
+    a.*
     FROM
     c_plan_report a
-    left join f_equipment b on b.id = a.drill_equip
     <where>
-        <if test="drillEquip != null and drillEquip != ''">
-            a.drill_equip = #{drillEquip}
+        <if test="drillEquipId != null and drillEquipId != ''">
+            a.drill_equip_id = #{drillEquipId}
         </if>
         <if test="drillType != null and drillType != ''">
             AND a.drill_type = #{drillType}