查获记录-是否常见违禁品+违禁品描述

airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemSeizureRecordController.java

@@ -166,7 +166,8 @@ public class ItemSeizureRecordController extends BaseController {
                     exportVO.setCheckPositionNameTwo("");
                     exportVO.setHandlingMethod("");
                     exportVO.setIsActiveConcealmentDesc("");
-
+                    exportVO.setCommonContraband(null);
+                    exportVO.setContrabandDesc("");
                     exportList.add(exportVO);
                 } else {
                     // 处理有物品的记录
@@ -201,7 +202,8 @@ public class ItemSeizureRecordController extends BaseController {
                         String handlingMethodLabel = DictUtils.getDictLabel("item_handling_method", item.getHandlingMethod());
                         exportVO.setHandlingMethod(StringUtils.isNotEmpty(handlingMethodLabel) ? handlingMethodLabel : item.getHandlingMethod());
                         exportVO.setIsActiveConcealmentDesc("1".equals(String.valueOf(item.getIsActiveConcealment())) ? "是" : "否");
-
+                        exportVO.setCommonContraband(item.getCommonContraband());
+                        exportVO.setContrabandDesc(item.getContrabandDesc());
                         exportList.add(exportVO);
                     }
                 }

airport-item/src/main/java/com/sundot/airport/item/domain/ItemSeizureItems.java

@@ -177,6 +177,18 @@ public class ItemSeizureItems extends BaseEntity {
     private String attachmentName;
 
     /**
+     * 是否常见违禁品（0-否，1-是）
+     */
+    @Excel(name = "是否常见违禁品（0-否，1-是）")
+    private Integer commonContraband;
+
+    /**
+     * 违禁品描述
+     */
+    @Excel(name = "违禁品描述")
+    private String contrabandDesc;
+
+    /**
      * 附件列表
      */
     private List<BaseAttachment> baseAttachmentList;
@@ -373,6 +385,22 @@ public class ItemSeizureItems extends BaseEntity {
         return attachmentName;
     }
 
+    public Integer getCommonContraband() {
+        return commonContraband;
+    }
+
+    public void setCommonContraband(Integer commonContraband) {
+        this.commonContraband = commonContraband;
+    }
+
+    public String getContrabandDesc() {
+        return contrabandDesc;
+    }
+
+    public void setContrabandDesc(String contrabandDesc) {
+        this.contrabandDesc = contrabandDesc;
+    }
+
     public List<BaseAttachment> getBaseAttachmentList() {
         return baseAttachmentList;
     }
@@ -427,6 +455,8 @@ public class ItemSeizureItems extends BaseEntity {
                 ", attachmentId='" + attachmentId + '\'' +
                 ", attachmentUrl='" + attachmentUrl + '\'' +
                 ", attachmentName='" + attachmentName + '\'' +
+                ", commonContraband='" + commonContraband + '\'' +
+                ", contrabandDesc='" + contrabandDesc + '\'' +
                 ", baseAttachmentList=" + baseAttachmentList +
                 '}';
     }

airport-item/src/main/java/com/sundot/airport/item/domain/vo/ItemSeizureRecordExportVO.java

@@ -91,6 +91,18 @@ public class ItemSeizureRecordExportVO {
     private String xrayOperator;
 
     /**
+     * 是否常见违禁品（0-否，1-是）
+     */
+    @Excel(name = "是否常见违禁品", readConverterExp = "0=否,1=是", combo = "否,是", sort = 14)
+    private Integer commonContraband;
+
+    /**
+     * 违禁品描述
+     */
+    @Excel(name = "违禁品描述", sort = 15)
+    private String contrabandDesc;
+
+    /**
      * 流程状态:0=草稿,1=审核中,2=人工终止,3=归档
      */
     @Excel(name = "流程状态", readConverterExp = "0=草稿,1=审核中,2=人工终止,3=归档", combo = "草稿,审核中,人工终止,归档")

airport-item/src/main/resources/mapper/item/ItemSeizureItemsMapper.xml

@@ -34,6 +34,8 @@
         <result property="attachmentId" column="attachment_id"/>
         <result property="attachmentUrl" column="attachment_url"/>
         <result property="attachmentName" column="attachment_name"/>
+        <result property="commonContraband" column="common_contraband"/>
+        <result property="contrabandDesc" column="contraband_desc"/>
         <result property="location" column="location"/>
         <result property="locationText" column="location_text"/>
     </resultMap>
@@ -68,6 +70,8 @@
                attachment_id,
                attachment_url,
                attachment_name,
+               common_contraband,
+               contraband_desc,
                location,
                location_text
         from item_seizure_items
@@ -117,6 +121,12 @@
             <if test="attachmentName != null  and attachmentName != ''">and attachment_name like concat('%',
                 #{attachmentName}, '%')
             </if>
+            <if test="commonContraband != null  and commonContraband != ''">and common_contraband =
+                #{commonContraband}
+            </if>
+            <if test="contrabandDesc != null  and contrabandDesc != ''">and contraband_desc like
+                concat('%', #{contrabandDesc}, '%')
+            </if>
         </where>
         order by create_time desc
     </select>
@@ -167,6 +177,8 @@
             <if test="attachmentId != null">attachment_id,</if>
             <if test="attachmentUrl != null">attachment_url,</if>
             <if test="attachmentName != null">attachment_name,</if>
+            <if test="commonContraband != null">common_contraband,</if>
+            <if test="contrabandDesc != null">contraband_desc,</if>
             <if test="location != null">location,</if>
             <if test="locationText != null">location_text,</if>
         </trim>
@@ -200,6 +212,8 @@
             <if test="attachmentId != null">#{attachmentId},</if>
             <if test="attachmentUrl != null">#{attachmentUrl},</if>
             <if test="attachmentName != null">#{attachmentName},</if>
+            <if test="commonContraband != null">#{commonContraband},</if>
+            <if test="contrabandDesc != null">#{contrabandDesc},</if>
             <if test="location != null">#{location},</if>
             <if test="locationText != null">#{locationText},</if>
         </trim>
@@ -248,6 +262,8 @@
             <if test="attachmentId != null">attachment_id = #{attachmentId},</if>
             <if test="attachmentUrl != null">attachment_url = #{attachmentUrl},</if>
             <if test="attachmentName != null">attachment_name = #{attachmentName},</if>
+            <if test="commonContraband != null">common_contraband = #{commonContraband},</if>
+            <if test="contrabandDesc != null">contraband_desc = #{contrabandDesc},</if>
             <if test="location != null">location = #{location},</if>
             <if test="locationText != null">location_text = #{locationText},</if>
         </trim>