查获记录-X光开机员

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

@@ -157,6 +157,7 @@ public class ItemSeizureRecordController extends BaseController {
                     exportVO.setInspectTeamName(record.getInspectTeamName());
                     exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
                     exportVO.setPowerOnInstruction(record.getPowerOnInstruction());
+                    exportVO.setXrayOperator(record.getXrayOperatorName());
                     exportVO.setProcessStatus(record.getProcessStatus());
 
                     // 物品信息为空
@@ -189,6 +190,7 @@ public class ItemSeizureRecordController extends BaseController {
                         exportVO.setInspectTeamName(record.getInspectTeamName());
                         exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
                         exportVO.setPowerOnInstruction(record.getPowerOnInstruction());
+                        exportVO.setXrayOperator(record.getXrayOperatorName());
                         exportVO.setProcessStatus(record.getProcessStatus());
 
                         // 物品信息

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

@@ -85,6 +85,12 @@ public class ItemSeizureRecordExportVO {
     private Integer powerOnInstruction;
 
     /**
+     * X光开机员
+     */
+    @Excel(name = "X光开机员", sort = 13)
+    private String xrayOperator;
+
+    /**
      * 流程状态:0=草稿,1=审核中,2=人工终止,3=归档
      */
     @Excel(name = "流程状态", readConverterExp = "0=草稿,1=审核中,2=人工终止,3=归档", combo = "草稿,审核中,人工终止,归档")

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

@@ -204,6 +204,10 @@
                 and seizure_time <![CDATA[ < ]]> date_add(#{endTime} , interval 1 day)
             </if>
             <if test="powerOnInstruction != null ">and power_on_instruction = #{powerOnInstruction}</if>
+            <if test="xrayOperatorId != null ">and xray_operator_id = #{xrayOperatorId}</if>
+            <if test="xrayOperatorName != null  and xrayOperatorName != ''">and xray_operator_name like
+                concat('%', #{xrayOperatorName}, '%')
+            </if>
         </where>
         order by create_time desc
     </select>