查获模块

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

@@ -142,10 +142,21 @@ public class ItemSeizureRecordController extends BaseController {
                     // 基本信息
                     exportVO.setInspectUserName(record.getInspectUserName());
                     exportVO.setSeizureTime(record.getSeizureTime());
-                    exportVO.setChannelName(record.getChannelName());
+                    StringBuilder sb = new StringBuilder();
+                    if (StringUtils.isNotEmpty(record.getTerminlName())) {
+                        sb.append(record.getTerminlName()).append("/");
+                    }
+                    if (StringUtils.isNotEmpty(record.getRegionalName())) {
+                        sb.append(record.getRegionalName()).append("/");
+                    }
+                    if (StringUtils.isNotEmpty(record.getChannelName())) {
+                        sb.append(record.getChannelName());
+                    }
+                    exportVO.setChannelName(sb.toString());
                     exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
                     exportVO.setInspectTeamName(record.getInspectTeamName());
                     exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
+                    exportVO.setProcessStatus(record.getProcessStatus());
 
                     // 物品信息为空
                     exportVO.setCategoryNameTwo("");
@@ -162,10 +173,21 @@ public class ItemSeizureRecordController extends BaseController {
                         // 基本信息
                         exportVO.setInspectUserName(record.getInspectUserName());
                         exportVO.setSeizureTime(record.getSeizureTime());
-                        exportVO.setChannelName(record.getChannelName());
+                        StringBuilder sb = new StringBuilder();
+                        if (StringUtils.isNotEmpty(record.getTerminlName())) {
+                            sb.append(record.getTerminlName()).append("/");
+                        }
+                        if (StringUtils.isNotEmpty(record.getRegionalName())) {
+                            sb.append(record.getRegionalName()).append("/");
+                        }
+                        if (StringUtils.isNotEmpty(record.getChannelName())) {
+                            sb.append(record.getChannelName());
+                        }
+                        exportVO.setChannelName(sb.toString());
                         exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
                         exportVO.setInspectTeamName(record.getInspectTeamName());
                         exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
+                        exportVO.setProcessStatus(record.getProcessStatus());
 
                         // 物品信息
                         exportVO.setCategoryNameTwo(item.getCategoryNameOne() + "/" + item.getCategoryNameTwo());

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

@@ -8,7 +8,6 @@ import java.util.Date;
 
 /**
  * 查获记录导出VO对象
- *
  */
 @Data
 public class ItemSeizureRecordExportVO {
@@ -79,5 +78,10 @@ public class ItemSeizureRecordExportVO {
     @Excel(name = "是否隐匿夹带", sort = 11)
     private String isActiveConcealmentDesc;
 
+    /**
+     * 流程状态:0=草稿,1=审核中,2=人工终止,3=归档
+     */
+    @Excel(name = "流程状态", readConverterExp = "0=草稿,1=审核中,2=人工终止,3=归档", combo = "草稿,审核中,人工终止,归档")
+    private String processStatus;
 
 }