Ver código fonte

危化品查询

wangqian 1 semana atrás
pai
commit
1168ab0253

+ 78 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/controller/GoodsEntryController.java

@@ -0,0 +1,78 @@
+package cn.gov.customs.wxjy.analyze.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.gov.customs.cacp.sdks.core.result.Result;
+import cn.gov.customs.cacp.sdks.core.user.annotation.LogonUser;
+import cn.gov.customs.cacp.sdks.core.user.pojo.CacpLogonUser;
+import cn.gov.customs.wxjy.analyze.pojo.EntryInfo;
+import cn.gov.customs.wxjy.analyze.pojo.EntryList;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import cn.gov.customs.wxjy.common.core.controller.BaseController;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import cn.gov.customs.wxjy.analyze.pojo.Entry;
+import cn.gov.customs.wxjy.analyze.pojo.EntryHead;
+import cn.gov.customs.wxjy.analyze.pojo.EntryQuery;
+import cn.gov.customs.wxjy.analyze.service.IGoodsEntryService;
+import cn.gov.customs.wxjy.common.utils.poi.ExcelUtil;
+import cn.gov.customs.wxjy.common.utils.StringUtils;
+
+/**
+ * 危险品报关单头Controller
+ * @author xiong
+ * @date 2025-12-04
+ */
+@RestController
+@RequestMapping("/analyze/goodsEntry")
+@RequiredArgsConstructor
+public class GoodsEntryController extends BaseController {
+
+    private final IGoodsEntryService service;
+
+    @GetMapping("/get-entry")
+    public Result<EntryInfo> getEntryHead(@RequestParam String entryId) {
+        EntryHead head = this.service.selectByEntryId(entryId);
+        EntryInfo info = new EntryInfo();
+        info.setInfo(head);
+        List<EntryList> list = this.service.getEntryList(entryId);
+        info.setList(list);
+        return Result.success(info);
+    }
+
+    /**
+     * 查询危险品报关单头列表
+     */
+    @PostMapping("/get-list")
+    public Result<PageInfo<Entry>> list(@LogonUser CacpLogonUser user, @RequestBody EntryQuery query) {
+        PageHelper.startPage(query.getPageIndex(), query.getPageSize());
+        String customsCode = user.getCustomsCode();
+        //总关查所有,判断是否为总关用户
+        if(StringUtils.isEmpty(query.getCustomsCode())){
+            if(!"4700".equals(customsCode)){
+                query.setCustomsCode(customsCode);
+            }
+        }
+        PageInfo<Entry> list = this.service.selectPageList(query);
+        return Result.success(list);
+    }
+
+    /**
+     * 导出危险品报关单头列表
+     */
+    @PostMapping("/goods-export")
+    public void export(@LogonUser CacpLogonUser user, HttpServletResponse response, @RequestBody EntryQuery query) {
+        String customsCode = user.getCustomsCode();
+        //总关查所有,判断是否为总关用户
+        if(StringUtils.isEmpty(query.getCustomsCode())){
+            if(!"4700".equals(customsCode)){
+                query.setCustomsCode(customsCode);
+            }
+        }
+        List<Entry> list = this.service.exportList(query);
+        ExcelUtil<Entry> util = new ExcelUtil<Entry>(Entry.class);
+        util.exportExcel(response, list, "危险品报关单头数据");
+    }
+}

+ 10 - 1
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/controller/NewDeclaredGoodsController.java

@@ -4,6 +4,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.gov.customs.cacp.sdks.core.result.Result;
+import cn.gov.customs.cacp.sdks.core.user.annotation.LogonUser;
+import cn.gov.customs.cacp.sdks.core.user.pojo.CacpLogonUser;
 import cn.gov.customs.cacp.sdks.core.user.trans.CacpTransUser;
 import cn.gov.customs.cacp.sdks.core.user.trans.UserContextHolder;
 import cn.gov.customs.wxjy.common.utils.StringUtils;
@@ -36,7 +38,14 @@ public class NewDeclaredGoodsController extends BaseController {
      * 查询新申报商品提示列表
      */
     @PostMapping("/get-list")
-    public Result<PageInfo<NewDeclaredGoods>> list(@RequestBody NewDeclaredGoodsQuery query) {
+    public Result<PageInfo<NewDeclaredGoods>> list(@LogonUser CacpLogonUser user, @RequestBody NewDeclaredGoodsQuery query) {
+        String customsCode = user.getCustomsCode();
+        //总关查所有,判断是否为总关用户
+        if(StringUtils.isEmpty(query.getCustomsCode())){
+            if(!"4700".equals(customsCode)){
+                query.setCustomsCode(customsCode);
+            }
+        }
         PageHelper.startPage(query.getPageIndex(), query.getPageSize());
         PageInfo<NewDeclaredGoods> list = newDeclaredGoodsService.selectPageList(query);
         return Result.success(list);

+ 46 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/dao/GoodsEntryDao.java

@@ -0,0 +1,46 @@
+package cn.gov.customs.wxjy.analyze.dao;
+
+import java.util.List;
+
+import cn.gov.customs.wxjy.analyze.pojo.Entry;
+import cn.gov.customs.wxjy.analyze.pojo.EntryList;
+import org.apache.ibatis.annotations.Mapper;
+import cn.gov.customs.wxjy.analyze.pojo.EntryHead;
+import cn.gov.customs.wxjy.analyze.pojo.EntryQuery;
+
+/**
+ * 危险品报关单头Mapper接口
+ *
+ * @author xiong
+ * @date 2025-12-04
+ */
+@Mapper
+public interface GoodsEntryDao {
+    /**
+     * 查询危险品报关单头
+     * @param entryId 危险品报关单头主键
+     * @return 危险品报关单头
+     */
+    public EntryHead selectByEntryId(String entryId);
+
+    /**
+     * 查询危险品报关单头列表
+     * @param entryHead 危险品报关单头
+     * @return 危险品报关单头集合
+     */
+    public List<Entry> selectPageList(EntryQuery entryHead);
+
+    /**
+     * 查询危险品报关单体列表
+     * @param entryId 危险品报关单头
+     * @return 危险品报关单体集合
+     */
+    List<EntryList> getEntryList(String entryId);
+
+    /**
+     * 查询危险品报关单头列表
+     * @param entryHead 危险品报关单头
+     * @return 危险品报关单头集合
+     */
+    public List<Entry> selectList(EntryQuery entryHead);
+}

+ 263 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/pojo/Entry.java

@@ -0,0 +1,263 @@
+package cn.gov.customs.wxjy.analyze.pojo;
+
+import cn.gov.customs.wxjy.common.annotation.Excel;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+
+/**
+ * @description 法检报关单表头
+ * @author wangqian
+ * @since 2025/11/4 上午10:16
+ */
+@Getter
+@Setter
+public class Entry implements Serializable {
+  // 报关单号,18位,4位关区代码+4位年份+入境(1)/出境(0)+9位序列号
+  private String id;
+
+  // 报关单号,18位,4位关区代码+4位年份+入境(1)/出境(0)+9位序列号
+  private String entryId;
+  /** 维护状态 */
+  private String mainStatus;
+
+  /** 通关模式 */
+  private String passMode;
+
+  // 运输方式 2:水运 3:铁路 4:公路 5:空运 6:邮件 9:其它
+  private String trafMode;
+
+  // 出入境标志 I:入境 E:出境
+  private String ieFlag;
+
+  // 进出境口岸:4位
+  private String iePort;
+
+  // 申报口岸:业务现场关区代码:4位
+  private String declPort;
+
+  // 所属海关:4位
+  private String customsCode;
+
+  // 货物运抵(进出口)时间
+  private LocalDateTime ieDate;
+
+  // 申报时间
+  private LocalDateTime declDate;
+
+  /** 是否提前申报标记 */
+  private String declAdvanceFlag;
+
+  /** 自动受理时间 */
+  private LocalDateTime acceptDate;
+
+  // 自动受理时间:对应ENTRY_WORKFLOW表STEP_ID='10000000'节点
+  // TODO
+  // 注:(用户建议)对于提前申报的单子,由于货物出入境日期晚于申报日期,自动受理时间会早于货物出入境日期,这种情况将自动受理时间重新赋值为货物出入境日期
+  private LocalDateTime exInPortDate;
+
+  // 境内收发货人代码
+  private String consignScc;
+
+  private String consignCode;
+
+  // 境内收发货人名称
+  private String consignName;
+
+  /**
+   * 境外收发货人代码
+   */
+  private String frnConsignCode;
+  /**
+   * 境外收发货人名称(中文)
+   */
+  private String frnConsignName;
+
+  // 监管方式
+  private String tradeMode;
+
+  // 贸易国别代码
+  private String tradeCountry;
+
+  //货运量毛重
+  private BigDecimal grossWt;
+
+  //货运量净重
+  private BigDecimal netWt;
+
+  /** 货运值人民币 */
+  private BigDecimal rmbPrice;
+
+  /** 货运值美元 */
+  private BigDecimal usdPrice;
+
+  /** 集装箱数量 */
+  private BigInteger container;
+
+  // 报关模式(部分订单既是两步申报又是提前申报,做多两种模式所以该字段采用逗号存储,方便组合查询):
+  // 1:一般申报 2:两步申报3:提前申报
+  private String declMode;
+
+  // 报关单状态 1:未放行 2:已放行未结关3:已结关
+  private String declStatus;
+
+  // 现场接单时间:对应ENTRY_WORKFLOW表STEP_ID='30000000'节点(只要PROC_RESULT为G的)
+  private LocalDateTime orderReceiveDate;
+
+  /** 接单耗时即单证审核时长(秒) */
+  private BigDecimal orderReceiveCost;
+
+  // 单证放行时间:ENTRY_WORKFLOW '70000000'节点时间
+  private LocalDateTime certRlsDate;
+
+  // 担保放行时间:对应ENTRY_WORKFLOW表STEP_ID='81000000'节点
+  private LocalDateTime preReleaseDate;
+
+  // 申报单位代码
+  private String agentCode;
+
+  // 申报单位名称
+  private String agentName;
+
+  // 备注
+  private String noteS;
+
+  // 货主单位代码/h2018生产销售单位代码
+  private String ownerCode;
+
+  // 货主单位名称/h2018生产销售单位名称
+  private String ownerName;
+
+  // 转关数据发送时间
+  private LocalDateTime examDate;
+
+  // 转关数据核销时间
+  private LocalDateTime checkDate;
+
+  // 完整申报电子申报时间
+  private LocalDateTime compEleDate;
+
+  // 结关时间
+  private LocalDateTime releaseDate;
+
+  /** 海关通关时间(秒) */
+  private BigDecimal cuCost;
+
+  /** 总体通关时间(秒) */
+  @Excel(name = "整体通关时间(秒)")
+  private BigDecimal totalCost;
+
+  /** 申报前准备时间(秒) */
+  @Excel(name = "申报前准备时间(秒)")
+  private BigDecimal beforeDeclCost;
+
+  // 报关单是否专业审单(环节代码33000000不为9999标记):1-是,其它-否
+  private String profVerifyFlag;
+
+  // 报关单是否新两步申报标记:1-是,其它-否
+  private String newTwoStepFlag;
+
+  //20250731新增业务
+  //电子申报时间:对应ENTRY_WORKFLOW表STEP_ID='00000000'节点
+  private LocalDateTime eleDeclDate;
+
+  //排查处置/现场验估时间:对应ENTRY_WORKFLOW表STEP_ID='26000000'节点(只要PROC_RESULT为M的)
+  private LocalDateTime assessStartDate;
+
+  //验估处置完毕时间:对应ENTRY_WORKFLOW表STEP_ID='26000000'节点(只要PROC_RESULT为G的)
+  private LocalDateTime assessEndDate;
+
+  /** 退单时间 */
+  private LocalDateTime refundDate;
+
+  /** 是否退过单标记 */
+  private String refundFlag;
+
+  // 查验指令下达时间:来源CI_CHECK_MAN_WORK_HEAD(对接物流辅助系统进口理货时间和指令下达时间哪个晚哪个就是下发时间)
+  private LocalDateTime manCreateTime;
+
+  // 查验开始时间:来源CI_CHECK_MAN_WORK_HEAD
+  private LocalDateTime manChkTimeStart;
+
+  // 查验关区:4位
+  private String checkCustomsCode;
+
+  // 是否查验:1:是,0:否
+  private String checkFlag;
+
+  // 查验结束时间:来源CI_CHECK_MAN_WORK_HEAD
+  private LocalDateTime manChkTimeEnd;
+
+  // 处理结果
+  private String manProcResult;
+
+  // 处理意见
+  private String manProcIdea;
+
+  // 商品序号
+  private BigDecimal gNo;
+
+  //按综合处杨科要求在新组合查询功能新增根据商品名称模糊查询
+  private String codeTs;
+
+  /**
+   * 检验检疫编码
+   */
+  private String iqCode;
+
+  //按综合处杨科要求在新组合查询功能新增根据商品名称模糊查询    wq
+  private String gName;
+
+  private String gModel;
+
+  //第一(法定)数量
+  private BigDecimal qty1;
+
+  // 货运值人民币
+  private BigDecimal rmbPriceList;
+
+  // 货运值美元
+  private BigDecimal usdPriceList;
+
+  //六位商品编码  2024-10-16
+  private String codeTsShort;
+
+  //每项商品需要监管证件
+  private String gCertFlag;
+
+  /**
+   * UN编码
+   */
+  private String ungid;
+
+  /**
+   * 非危险化学品
+   */
+  private String ungFlag;
+  /**
+   * 危包规格
+   */
+  private String ungModel;
+  /**
+   * 危包类别
+   */
+  private String ungClassify;
+
+  /**
+   * 危险货物名称
+   */
+  private String ungGName;
+  /**
+   * 货物属性代码
+   */
+  private String productCharCode;
+
+  /**
+   * 危险品类型(1、危化品;2、危险货物;3、危化品兼危险货物)
+   */
+  private String goodsType;
+}

+ 37 - 32
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/pojo/EntryHead.java

@@ -1,11 +1,12 @@
 package cn.gov.customs.wxjy.analyze.pojo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import cn.gov.customs.wxjy.common.annotation.Excel;
 import cn.gov.customs.wxjy.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+
 /**
  * 危险品报关单头对象 WXJY_ENTRY_HEAD
  *
@@ -33,23 +34,27 @@ private static final long serialVersionUID = 1L;
 
     /** 出入境标志 */
     @Excel(name = "出入境标志")
-    private String iEFlag;
+    private String ieFlag;
 
     /** 进出境口岸 */
     @Excel(name = "进出境口岸")
-    private String iEPort;
+    private String iePort;
 
     /** 申报口岸 */
     @Excel(name = "申报口岸")
     private String declPort;
 
+    /** 所属海关 */
+    @Excel(name = "所属海关")
+    private String customsCode;
+
     /** 货物运抵(进出口)时间 */
     @Excel(name = "货物运抵(进出口)时间")
-    private String iEDate;
+    private LocalDateTime ieDate;
 
     /** 申报时间 */
     @Excel(name = "申报时间")
-    private String declDate;
+    private LocalDateTime declDate;
 
     /** 是否提前申报标记 */
     @Excel(name = "是否提前申报标记")
@@ -57,11 +62,11 @@ private static final long serialVersionUID = 1L;
 
     /** 自动受理时间 */
     @Excel(name = "自动受理时间")
-    private String acceptDate;
+    private LocalDateTime acceptDate;
 
     /** 出境报关单-货物进港时间 */
     @Excel(name = "出境报关单-货物进港时间")
-    private String exInPortDate;
+    private LocalDateTime exInPortDate;
 
     /** 境内收发货人代码 */
     @Excel(name = "境内收发货人代码")
@@ -93,23 +98,23 @@ private static final long serialVersionUID = 1L;
 
     /** 货运量毛重 */
     @Excel(name = "货运量毛重")
-    private String grossWt;
+    private BigDecimal grossWt;
 
     /** 货运量净重 */
     @Excel(name = "货运量净重")
-    private String netWt;
+    private BigDecimal netWt;
 
     /** 货运值人民币 */
     @Excel(name = "货运值人民币")
-    private String rmbPrice;
+    private BigDecimal rmbPrice;
 
     /** 货运值美元 */
     @Excel(name = "货运值美元")
-    private String usdPrice;
+    private BigDecimal usdPrice;
 
     /** 集装箱数量 */
     @Excel(name = "集装箱数量")
-    private String CONTAINER;
+    private BigInteger container;
 
     /** 报关模式 */
     @Excel(name = "报关模式")
@@ -121,19 +126,19 @@ private static final long serialVersionUID = 1L;
 
     /** 现场接单时间 */
     @Excel(name = "现场接单时间")
-    private String orderReceiveDate;
+    private LocalDateTime orderReceiveDate;
 
     /** 接单耗时即单证审核时长(秒) */
     @Excel(name = "接单耗时即单证审核时长(秒)")
-    private String orderReceiveCost;
+    private Long orderReceiveCost;
 
     /** 单证放行时间 */
     @Excel(name = "单证放行时间")
-    private String certRlsDate;
+    private LocalDateTime certRlsDate;
 
     /** 担保放行时间 */
     @Excel(name = "担保放行时间")
-    private String preReleaseDate;
+    private LocalDateTime preReleaseDate;
 
     /** 申报单位代码 */
     @Excel(name = "申报单位代码")
@@ -157,31 +162,31 @@ private static final long serialVersionUID = 1L;
 
     /** 转关数据发送时间 */
     @Excel(name = "转关数据发送时间")
-    private String examDate;
+    private LocalDateTime examDate;
 
     /** 转关数据核销时间 */
     @Excel(name = "转关数据核销时间")
-    private String checkDate;
+    private LocalDateTime checkDate;
 
     /** 完整申报电子申报时间 */
     @Excel(name = "完整申报电子申报时间")
-    private String compEleDate;
+    private LocalDateTime compEleDate;
 
     /** 结关时间 */
     @Excel(name = "结关时间")
-    private String releaseDate;
+    private LocalDateTime releaseDate;
 
     /** 海关通关时间(秒) */
     @Excel(name = "海关通关时间(秒)")
-    private String cuCost;
+    private Long cuCost;
 
     /** 总体通关时间(秒) */
     @Excel(name = "总体通关时间(秒)")
-    private String totalCost;
+    private Long totalCost;
 
     /** 申报前准备时间(秒) */
     @Excel(name = "申报前准备时间(秒)")
-    private String beforeDeclCost;
+    private Long beforeDeclCost;
 
     /** 是否专业审单 */
     @Excel(name = "是否专业审单")
@@ -193,19 +198,19 @@ private static final long serialVersionUID = 1L;
 
     /** 电子申报时间 */
     @Excel(name = "电子申报时间")
-    private String eleDeclDate;
+    private LocalDateTime eleDeclDate;
 
     /** 现场验估时间 */
     @Excel(name = "现场验估时间")
-    private String assessStartDate;
+    private LocalDateTime assessStartDate;
 
     /** 验估处置完毕时间 */
     @Excel(name = "验估处置完毕时间")
-    private String assessEndDate;
+    private LocalDateTime assessEndDate;
 
     /** 退单时间 */
     @Excel(name = "退单时间")
-    private String refundDate;
+    private LocalDateTime refundDate;
 
     /** 是否退过单标记 */
     @Excel(name = "是否退过单标记")
@@ -213,15 +218,15 @@ private static final long serialVersionUID = 1L;
 
     /** 查验指令下达时间 */
     @Excel(name = "查验指令下达时间")
-    private String manCreateTime;
+    private LocalDateTime manCreateTime;
 
     /** 查验开始时间 */
     @Excel(name = "查验开始时间")
-    private String manChkTimeStart;
+    private LocalDateTime manChkTimeStart;
 
     /** 查验结束时间 */
     @Excel(name = "查验结束时间")
-    private String manChkTimeEnd;
+    private LocalDateTime manChkTimeEnd;
 
     /** 查验关区 */
     @Excel(name = "查验关区")

+ 22 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/pojo/EntryInfo.java

@@ -0,0 +1,22 @@
+package cn.gov.customs.wxjy.analyze.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description 报关单表头
+ * @author wangqian
+ * @since 2025/12/9 上午10:16
+ */
+@Getter
+@Setter
+public class EntryInfo implements Serializable {
+
+  // 报关单号,18位,4位关区代码+4位年份+入境(1)/出境(0)+9位序列号
+  private EntryHead info;
+
+  private List<EntryList> list;
+}

+ 94 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/pojo/EntryList.java

@@ -0,0 +1,94 @@
+package cn.gov.customs.wxjy.analyze.pojo;
+
+import cn.gov.customs.wxjy.common.annotation.Excel;
+import cn.gov.customs.wxjy.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 危险品报关单头对象 WXJY_ENTRY_HEAD
+ *
+ * @author xiong
+ * @date 2025-12-04
+ */
+@Data
+public class EntryList implements Serializable {
+private static final long serialVersionUID = 1L;
+    // 报关单号,18位,4位关区代码+4位年份+入境(1)/出境(0)+9位序列号
+    private String id;
+
+    private String entryId;
+
+    // 商品序号
+    private BigDecimal gNo;
+
+    //按综合处杨科要求在新组合查询功能新增根据商品名称模糊查询
+    private String codeTs;
+
+    //按综合处杨科要求在新组合查询功能新增根据商品名称模糊查询    wq
+    private String gName;
+
+    private String gModel;
+
+    //第一(法定)数量
+    private BigDecimal qty1;
+
+    // 货运值人民币
+    private BigDecimal rmbPriceList;
+
+    // 货运值美元
+    private BigDecimal usdPriceList;
+
+    // 最大节点时间:对应ENTRY_WORKFLOW表,用于数据每日更新,流程表中CREATE_DATE为当天日期时,
+    // acceptDate为前几天不能用该字段进行每日更新范围操作时间
+    private LocalDateTime releaseDate;
+
+    //六位商品编码  2024-10-16
+    private String codeTsShort;
+
+    //每项商品需要监管证件
+    private String gCertFlag;
+
+    /**
+     * UN编码
+     */
+    private String ungid;
+
+    /**
+     * 非危险化学品
+     */
+    private String ungFlag;
+    /**
+     * 危包规格
+     */
+    private String ungModel;
+    /**
+     * 危包类别
+     */
+    private String ungClassify;
+
+    /**
+     * 危险货物名称
+     */
+    private String ungGName;
+    /**
+     * 货物属性代码
+     */
+    private String productCharCode;
+
+    /**
+     * 检验检疫编码
+     */
+    private String iqCode;
+
+    /**
+     * 危险品类型(1、危化品;2、危险货物;3、危化品兼危险货物)
+     */
+    private String goodsType;
+
+}

+ 49 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/pojo/EntryQuery.java

@@ -0,0 +1,49 @@
+package cn.gov.customs.wxjy.analyze.pojo;
+
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 危险品报关单头对象 WXJY_ENTRY_HEAD
+ *
+ * @author xiong
+ * @date 2025-12-04
+ */
+@Data
+public class EntryQuery implements Serializable {
+
+    /** 报关单号 */
+    private String entryId;
+
+    /** 通关模式 */
+   private String passMode;
+
+    /** 运输方式 */
+    private String trafMode;
+
+    /** 出入境标志 */
+                    private String ieFlag;
+
+    /** 进出境口岸 */
+                    private String iePort;
+    /** 所属海关 */
+    private String customsCode;
+
+    /** 监管方式 */
+                    private String tradeMode;
+
+    /** 报关模式 */
+                    private String declMode;
+
+    /** 是否查验 */
+                    private String checkFlag;
+
+    private String goodsType;
+
+    private String beginReleaseDate;
+    private String endReleaseDate;
+    private int pageIndex;
+    private int pageSize;
+}

+ 46 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/service/IGoodsEntryService.java

@@ -0,0 +1,46 @@
+package cn.gov.customs.wxjy.analyze.service;
+
+import java.util.List;
+
+import cn.gov.customs.wxjy.analyze.pojo.EntryHead;
+import cn.gov.customs.wxjy.analyze.pojo.Entry;
+import cn.gov.customs.wxjy.analyze.pojo.EntryList;
+import cn.gov.customs.wxjy.analyze.pojo.EntryQuery;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 危险品报关单头Service接口
+ *
+ * @author xiong
+ * @date 2025-12-04
+ */
+public interface IGoodsEntryService {
+    /**
+     * 查询危险品报关单头
+     *
+     * @param entryId 危险品报关单头主键
+     * @return 危险品报关单头
+     */
+    public EntryHead selectByEntryId(String entryId);
+
+    /**
+     * 分页查询危险品报关单头列表
+     * @param query
+     * @return 危险品报关单头集合
+     */
+    public PageInfo<Entry> selectPageList(EntryQuery query);
+    /**
+     * 查询危险品报关单体列表
+     * @param entryId 危险品报关单头
+     * @return 危险品报关单体集合
+     */
+    List<EntryList> getEntryList(String entryId);
+
+
+    /**
+     * 分页查询危险品报关单头列表
+     * @param query
+     * @return 危险品报关单头集合
+     */
+    public List<Entry> exportList(EntryQuery query);
+}

+ 68 - 0
wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/service/impl/GoodsEntryServiceImpl.java

@@ -0,0 +1,68 @@
+package cn.gov.customs.wxjy.analyze.service.impl;
+
+import cn.gov.customs.wxjy.analyze.pojo.EntryList;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.github.pagehelper.PageInfo;
+import cn.gov.customs.wxjy.analyze.dao.GoodsEntryDao;
+import cn.gov.customs.wxjy.analyze.pojo.Entry;
+import cn.gov.customs.wxjy.analyze.pojo.EntryHead;
+import cn.gov.customs.wxjy.analyze.pojo.EntryQuery;
+import cn.gov.customs.wxjy.analyze.service.IGoodsEntryService;
+
+/**
+ * 危险品报关单头Service业务层处理
+ *
+ * @author xiong
+ * @date 2025-12-04
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class GoodsEntryServiceImpl implements IGoodsEntryService {
+
+    private final GoodsEntryDao mapper;
+
+    /**
+     * 查询危险品报关单头
+     *
+     * @param entryId 危险品报关单头主键
+     * @return 危险品报关单头
+     */
+    @Override
+    public EntryHead selectByEntryId(String entryId) {
+        return mapper.selectByEntryId(entryId);
+    }
+
+    /**
+     * 分页查询危险品报关单头列表
+     *
+     * @param query
+     * @return 危险品报关单头
+     */
+    @Override
+    public PageInfo<Entry> selectPageList(EntryQuery query) {
+        return PageInfo.of(mapper.selectPageList(query));
+    }
+
+    @Override
+    public List<EntryList> getEntryList(String entryId) {
+        return this.mapper.getEntryList(entryId);
+    }
+
+    /**
+     * 导出危险品报关单头列表
+     *
+     * @param query
+     * @return 危险品报关单头
+     */
+    @Override
+    public List<Entry> exportList(EntryQuery query) {
+        return mapper.selectPageList(query);
+    }
+}

+ 235 - 0
wxjy-wxjy-service/src/main/resources/mapper/analyze/GoodsEntryMapper.xml

@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.gov.customs.wxjy.analyze.dao.GoodsEntryDao">
+    <resultMap id="EntryResultMap" type="cn.gov.customs.wxjy.analyze.pojo.Entry">
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
+        <result column="ENTRY_ID" jdbcType="VARCHAR" property="entryId"/>
+        <result column="MAIN_STATUS" jdbcType="VARCHAR" property="mainStatus"/>
+        <result column="PASS_MODE" jdbcType="VARCHAR" property="passMode"/>
+        <result column="TRAF_MODE" jdbcType="VARCHAR" property="trafMode"/>
+        <result column="I_E_FLAG" jdbcType="VARCHAR" property="ieFlag"/>
+        <result column="I_E_PORT" jdbcType="VARCHAR" property="iePort"/>
+        <result column="DECL_PORT" jdbcType="VARCHAR" property="declPort"/>
+        <result column="CUSTOMS_CODE" jdbcType="VARCHAR" property="customsCode"/>
+        <result column="I_E_DATE" jdbcType="TIMESTAMP" property="ieDate"/>
+        <result column="DECL_DATE" jdbcType="TIMESTAMP" property="declDate"/>
+        <result column="DECL_ADVANCE_FLAG" jdbcType="VARCHAR" property="declAdvanceFlag"/>
+        <result column="ACCEPT_DATE" jdbcType="TIMESTAMP" property="acceptDate"/>
+        <result column="EX_IN_PORT_DATE" jdbcType="TIMESTAMP" property="exInPortDate"/>
+        <result column="CONSIGN_SCC" jdbcType="VARCHAR" property="consignScc"/>
+        <result column="CONSIGN_CODE" jdbcType="VARCHAR" property="consignCode"/>
+        <result column="CONSIGN_NAME" jdbcType="VARCHAR" property="consignName"/>
+        <result column="CONSIGN_SCC" jdbcType="VARCHAR" property="consignScc"/>
+        <result column="FRN_CONSIGN_CODE" jdbcType="VARCHAR" property="frnConsignCode"/>
+        <result column="FRN_CONSIGN_NAME" jdbcType="VARCHAR" property="frnConsignName"/>
+        <result column="TRADE_MODE" jdbcType="VARCHAR" property="tradeMode"/>
+        <result column="TRADE_COUNTRY" jdbcType="VARCHAR" property="tradeCountry"/>
+        <result column="GROSS_WT" jdbcType="NUMERIC" property="grossWt"/>
+        <result column="NET_WT" jdbcType="NUMERIC" property="netWt"/>
+        <result column="RMB_PRICE" jdbcType="NUMERIC" property="rmbPrice"/>
+        <result column="USD_PRICE" jdbcType="NUMERIC" property="usdPrice"/>
+        <result column="CONTAINER" jdbcType="NUMERIC" property="container"/>
+        <result column="DECL_MODE" jdbcType="VARCHAR" property="declMode"/>
+        <result column="DECL_STATUS" jdbcType="VARCHAR" property="declStatus"/>
+        <result column="ORDER_RECEIVE_DATE" jdbcType="TIMESTAMP" property="orderReceiveDate"/>
+        <result column="ORDER_RECEIVE_COST" jdbcType="NUMERIC" property="orderReceiveCost"/>
+        <result column="CERT_RLS_DATE" jdbcType="TIMESTAMP" property="certRlsDate"/>
+        <result column="PRE_RELEASE_DATE" jdbcType="TIMESTAMP" property="preReleaseDate"/>
+        <result column="AGENT_CODE" jdbcType="VARCHAR" property="agentCode"/>
+        <result column="AGENT_NAME" jdbcType="VARCHAR" property="agentName"/>
+        <result column="NOTE_S" jdbcType="VARCHAR" property="noteS"/>
+        <result column="OWNER_CODE" jdbcType="VARCHAR" property="ownerCode"/>
+        <result column="OWNER_NAME" jdbcType="VARCHAR" property="ownerName"/>
+        <result column="EXAM_DATE" jdbcType="TIMESTAMP" property="examDate"/>
+        <result column="CHECK_DATE" jdbcType="TIMESTAMP" property="checkDate"/>
+        <result column="COMP_ELE_DATE" jdbcType="TIMESTAMP" property="compEleDate"/>
+        <result column="RELEASE_DATE" jdbcType="TIMESTAMP" property="releaseDate"/>
+        <result column="CU_COST" jdbcType="NUMERIC" property="cuCost"/>
+        <result column="TOTAL_COST" jdbcType="NUMERIC" property="totalCost"/>
+        <result column="BEFORE_DECL_COST" jdbcType="NUMERIC" property="beforeDeclCost"/>
+        <result column="PROF_VERIFY_FLAG" jdbcType="VARCHAR" property="profVerifyFlag"/>
+        <result column="NEW_TWO_STEP_FLAG" jdbcType="VARCHAR" property="newTwoStepFlag"/>
+        <result column="ELE_DECL_DATE" jdbcType="TIMESTAMP" property="eleDeclDate"/>
+        <result column="ASSESS_START_DATE" jdbcType="TIMESTAMP" property="assessStartDate"/>
+        <result column="ASSESS_END_DATE" jdbcType="TIMESTAMP" property="assessEndDate"/>
+        <result column="REFUND_DATE" jdbcType="TIMESTAMP" property="refundDate"/>
+        <result column="REFUND_FLAG" jdbcType="VARCHAR" property="refundFlag"/>
+        <result column="MAN_CREATE_TIME" jdbcType="TIMESTAMP" property="manCreateTime"/>
+        <result column="MAN_CHK_TIME_START" jdbcType="TIMESTAMP" property="manChkTimeStart"/>
+        <result column="MAN_CHK_TIME_END" jdbcType="TIMESTAMP" property="manChkTimeEnd"/>
+        <result column="CHECK_CUSTOMS_CODE" jdbcType="VARCHAR" property="checkCustomsCode"/>
+        <result column="CHECK_FLAG" jdbcType="VARCHAR" property="checkFlag"/>
+        <result column="MAN_PROC_RESULT" jdbcType="VARCHAR" property="manProcResult"/>
+        <result column="MAN_PROC_IDEA" jdbcType="VARCHAR" property="manProcIdea"/>
+        <result column="G_NO" jdbcType="NUMERIC" property="gNo"/>
+        <result column="CODE_TS" jdbcType="VARCHAR" property="codeTs"/>
+        <result column="IQ_CODE" jdbcType="VARCHAR" property="iqCode"/>
+        <result column="G_NAME" jdbcType="VARCHAR" property="gName"/>
+        <result column="G_MODEL" jdbcType="VARCHAR" property="gModel"/>
+        <result column="QTY_1" jdbcType="NUMERIC" property="qty1"/>
+        <result column="RMB_PRICE" jdbcType="NUMERIC" property="rmbPriceList"/>
+        <result column="USD_PRICE" jdbcType="NUMERIC" property="usdPriceList"/>
+        <result column="CODE_TS_SHORT" jdbcType="VARCHAR" property="codeTsShort"/>
+        <result column="G_CERT_FLAG" jdbcType="VARCHAR" property="gCertFlag"/>
+        <result column="UNGID" jdbcType="VARCHAR" property="ungid"/>
+        <result column="UNG_FLAG" jdbcType="VARCHAR" property="ungFlag"/>
+        <result column="ungModel" jdbcType="VARCHAR" property="ungModel"/>
+        <result column="UNG_CLASSIFY" jdbcType="VARCHAR" property="ungClassify"/>
+        <result column="UNG_G_NAME" jdbcType="VARCHAR" property="ungGName"/>
+        <result column="PRODUCT_CHAR_CODE" jdbcType="VARCHAR" property="productCharCode"/>
+        <result column="IQ_CODE" jdbcType="VARCHAR" property="iqCode"/>
+        <result column="GOODS_TYPE" jdbcType="VARCHAR" property="goodsType"/>
+    </resultMap>
+
+    <resultMap type="EntryHead" id="EntryHeadResult">
+        <id column="ENTRY_ID" jdbcType="VARCHAR" property="entryId"/>
+        <result column="MAIN_STATUS" jdbcType="VARCHAR" property="mainStatus"/>
+        <result column="PASS_MODE" jdbcType="VARCHAR" property="passMode"/>
+        <result column="TRAF_MODE" jdbcType="VARCHAR" property="trafMode"/>
+        <result column="I_E_FLAG" jdbcType="VARCHAR" property="ieFlag"/>
+        <result column="I_E_PORT" jdbcType="VARCHAR" property="iePort"/>
+        <result column="DECL_PORT" jdbcType="VARCHAR" property="declPort"/>
+        <result column="CUSTOMS_CODE" jdbcType="VARCHAR" property="customsCode"/>
+        <result column="I_E_DATE" jdbcType="TIMESTAMP" property="ieDate"/>
+        <result column="DECL_DATE" jdbcType="TIMESTAMP" property="declDate"/>
+        <result column="DECL_ADVANCE_FLAG" jdbcType="VARCHAR" property="declAdvanceFlag"/>
+        <result column="ACCEPT_DATE" jdbcType="TIMESTAMP" property="acceptDate"/>
+        <result column="EX_IN_PORT_DATE" jdbcType="TIMESTAMP" property="exInPortDate"/>
+        <result column="CONSIGN_SCC" jdbcType="VARCHAR" property="consignScc"/>
+        <result column="CONSIGN_CODE" jdbcType="VARCHAR" property="consignCode"/>
+        <result column="CONSIGN_NAME" jdbcType="VARCHAR" property="consignName"/>
+        <result column="CONSIGN_SCC" jdbcType="VARCHAR" property="consignScc"/>
+        <result column="FRN_CONSIGN_CODE" jdbcType="VARCHAR" property="frnConsignCode"/>
+        <result column="FRN_CONSIGN_NAME" jdbcType="VARCHAR" property="frnConsignName"/>
+        <result column="TRADE_MODE" jdbcType="VARCHAR" property="tradeMode"/>
+        <result column="TRADE_COUNTRY" jdbcType="VARCHAR" property="tradeCountry"/>
+        <result column="GROSS_WT" jdbcType="NUMERIC" property="grossWt"/>
+        <result column="NET_WT" jdbcType="NUMERIC" property="netWt"/>
+        <result column="RMB_PRICE" jdbcType="NUMERIC" property="rmbPrice"/>
+        <result column="USD_PRICE" jdbcType="NUMERIC" property="usdPrice"/>
+        <result column="CONTAINER" jdbcType="NUMERIC" property="container"/>
+        <result column="DECL_MODE" jdbcType="VARCHAR" property="declMode"/>
+        <result column="DECL_STATUS" jdbcType="VARCHAR" property="declStatus"/>
+        <result column="ORDER_RECEIVE_DATE" jdbcType="TIMESTAMP" property="orderReceiveDate"/>
+        <result column="ORDER_RECEIVE_COST" jdbcType="NUMERIC" property="orderReceiveCost"/>
+        <result column="CERT_RLS_DATE" jdbcType="TIMESTAMP" property="certRlsDate"/>
+        <result column="PRE_RELEASE_DATE" jdbcType="TIMESTAMP" property="preReleaseDate"/>
+        <result column="AGENT_CODE" jdbcType="VARCHAR" property="agentCode"/>
+        <result column="AGENT_NAME" jdbcType="VARCHAR" property="agentName"/>
+        <result column="NOTE_S" jdbcType="VARCHAR" property="noteS"/>
+        <result column="OWNER_CODE" jdbcType="VARCHAR" property="ownerCode"/>
+        <result column="OWNER_NAME" jdbcType="VARCHAR" property="ownerName"/>
+        <result column="EXAM_DATE" jdbcType="TIMESTAMP" property="examDate"/>
+        <result column="CHECK_DATE" jdbcType="TIMESTAMP" property="checkDate"/>
+        <result column="COMP_ELE_DATE" jdbcType="TIMESTAMP" property="compEleDate"/>
+        <result column="RELEASE_DATE" jdbcType="TIMESTAMP" property="releaseDate"/>
+        <result column="CU_COST" jdbcType="NUMERIC" property="cuCost"/>
+        <result column="TOTAL_COST" jdbcType="NUMERIC" property="totalCost"/>
+        <result column="BEFORE_DECL_COST" jdbcType="NUMERIC" property="beforeDeclCost"/>
+        <result column="PROF_VERIFY_FLAG" jdbcType="VARCHAR" property="profVerifyFlag"/>
+        <result column="NEW_TWO_STEP_FLAG" jdbcType="VARCHAR" property="newTwoStepFlag"/>
+        <result column="ELE_DECL_DATE" jdbcType="TIMESTAMP" property="eleDeclDate"/>
+        <result column="ASSESS_START_DATE" jdbcType="TIMESTAMP" property="assessStartDate"/>
+        <result column="ASSESS_END_DATE" jdbcType="TIMESTAMP" property="assessEndDate"/>
+        <result column="REFUND_DATE" jdbcType="TIMESTAMP" property="refundDate"/>
+        <result column="REFUND_FLAG" jdbcType="VARCHAR" property="refundFlag"/>
+        <result column="MAN_CREATE_TIME" jdbcType="TIMESTAMP" property="manCreateTime"/>
+        <result column="MAN_CHK_TIME_START" jdbcType="TIMESTAMP" property="manChkTimeStart"/>
+        <result column="MAN_CHK_TIME_END" jdbcType="TIMESTAMP" property="manChkTimeEnd"/>
+        <result column="CHECK_CUSTOMS_CODE" jdbcType="VARCHAR" property="checkCustomsCode"/>
+        <result column="CHECK_FLAG" jdbcType="VARCHAR" property="checkFlag"/>
+        <result column="MAN_PROC_RESULT" jdbcType="VARCHAR" property="manProcResult"/>
+        <result column="MAN_PROC_IDEA" jdbcType="VARCHAR" property="manProcIdea"/>
+    </resultMap>
+
+    <resultMap id="EntryListResultMap" type="cn.gov.customs.wxjy.analyze.pojo.EntryList">
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
+        <result column="ENTRY_ID" jdbcType="VARCHAR" property="entryId"/>
+        <result column="G_NO" jdbcType="NUMERIC" property="gNo"/>
+        <result column="CODE_TS" jdbcType="VARCHAR" property="codeTs"/>
+        <result column="IQ_CODE" jdbcType="VARCHAR" property="iqCode"/>
+        <result column="G_NAME" jdbcType="VARCHAR" property="gName"/>
+        <result column="G_MODEL" jdbcType="VARCHAR" property="gModel"/>
+        <result column="QTY_1" jdbcType="NUMERIC" property="qty1"/>
+        <result column="RMB_PRICE" jdbcType="NUMERIC" property="rmbPriceList"/>
+        <result column="USD_PRICE" jdbcType="NUMERIC" property="usdPriceList"/>
+        <result column="CODE_TS_SHORT" jdbcType="VARCHAR" property="codeTsShort"/>
+        <result column="G_CERT_FLAG" jdbcType="VARCHAR" property="gCertFlag"/>
+        <result column="UNGID" jdbcType="VARCHAR" property="ungid"/>
+        <result column="UNG_FLAG" jdbcType="VARCHAR" property="ungFlag"/>
+        <result column="ungModel" jdbcType="VARCHAR" property="ungModel"/>
+        <result column="UNG_CLASSIFY" jdbcType="VARCHAR" property="ungClassify"/>
+        <result column="UNG_G_NAME" jdbcType="VARCHAR" property="ungGName"/>
+        <result column="PRODUCT_CHAR_CODE" jdbcType="VARCHAR" property="productCharCode"/>
+        <result column="IQ_CODE" jdbcType="VARCHAR" property="iqCode"/>
+        <result column="GOODS_TYPE" jdbcType="VARCHAR" property="goodsType"/>
+    </resultMap>
+
+    <select id="selectByEntryId" parameterType="String" resultMap="EntryHeadResult">
+        select * from WXJY_ENTRY_HEAD where ENTRY_ID = #{entryId}
+    </select>
+
+    <select id="selectPageList"  parameterType="EntryQuery" resultMap="EntryResultMap">
+        select b.entry_id,b.main_status,b.pass_mode,b.traf_mode,b.i_e_flag,b.i_e_port,b.decl_port,b.customs_code,b.i_e_date,b.decl_date,
+        b.decl_advance_flag,b.accept_date,b.ex_in_port_date,b.consign_scc,b.consign_code,b.consign_name,
+        b.frn_consign_code,b.frn_consign_name,b.trade_mode,b.trade_country,b.gross_wt,b.net_wt,b.rmb_price,b.usd_price,b.container,
+        b.decl_mode,b.decl_status,b.order_receive_date,nvl(round(b.order_receive_cost/3600,2),0) order_receive_cost,b.cert_rls_date,
+        b.pre_release_date,b.agent_code,b.agent_name,
+        b.note_s,b.owner_code,b.owner_name,b.exam_date,b.check_date,b.comp_ele_date,b.release_date,nvl(round(b.cu_cost/3600,2),0) cu_cost,
+        nvl(round(b.total_cost/3600,2),0) total_cost,nvl(round(b.before_decl_cost/3600,2),0) before_decl_cost,
+        b.prof_verify_flag,b.new_two_step_flag,b.ele_decl_date,b.assess_start_date,b.assess_end_date,b.refund_date,b.refund_flag,
+        b.man_create_time,b.man_chk_time_start,b.man_chk_time_end,b.check_flag,b.man_proc_result,b.man_proc_idea,b.check_customs_code,
+        a.g_no,a.code_ts,a.g_name,a.g_model,a.qty_1,a.rmb_price as rmbPriceList,a.usd_price as usdPriceList,a.code_ts_short,a.g_cert_flag,
+        a.ung_flag,a.ung_model,a.ung_classify,a.ung_g_name,a.product_char_code,a.iq_code,a.goods_type from(
+        select entry_id,g_no,code_ts,g_name,g_model,qty_1,rmb_price,usd_price,code_ts_short,g_cert_flag,
+        ung_flag,ung_model,ung_classify,ung_g_name,product_char_code,iq_code,goods_type from (
+        select entry_id,g_no,code_ts,g_name,g_model,qty_1,rmb_price,usd_price,code_ts_short,g_cert_flag,
+        ung_flag,ung_model,ung_classify,ung_g_name,product_char_code,iq_code,goods_type,
+        rank() over(PARTITION BY entry_id order by id) as rn from WXJY_ENTRY_LIST where 1=1
+        <if test="goodsType !=null and goodsType !=''">
+            and goods_type like CONCAT(CONCAT('%',#{goodsType}),'%')
+        </if>
+        ) h where h.rn=1 )a ,WXJY_ENTRY_HEAD b
+        where a.entry_id = b.entry_id
+        <if test="entryId !=null and entryId !=''">
+            and b.entry_id like concat(concat('%', #{entryId} ),'%')
+        </if>
+        <if test="passMode !=null and passMode !=''">
+            and b.pass_mode = #{passMode}
+        </if>
+        <if test="trafMode!=null and trafMode !=''">
+            and b.traf_mode = #{trafMode}
+        </if>
+        <if test="ieFlag!=null and ieFlag !=''">
+            and b.i_e_flag = #{ieFlag}
+        </if>
+        <if test="customsCode !=null and customsCode !=''">
+            and b.customs_code = #{customsCode}
+        </if>
+        <if test="declMode!=null and declMode !=''">
+            and b.decl_mode = #{declMode}
+        </if>
+        <if test="beginReleaseDate!=null and beginReleaseDate !=''">
+            AND date_format(b.release_date,'%y%m%d') >= date_format(#{beginReleaseDate},'%y%m%d')
+        </if>
+        <if test="endReleaseDate != null and endReleaseDate != ''"><!-- 结束时间检索 -->
+            AND date_format(b.release_date,'%y%m%d') &lt;= date_format(#{endReleaseDate},'%y%m%d')
+        </if>
+        <if test="checkFlag!=null and checkFlag !=''">
+            and b.check_flag = #{checkFlag}
+        </if>
+        <if test="tradeMode!=null and tradeMode !=''">
+            and b.trade_mode = #{tradeMode}
+        </if>
+    </select>
+
+    <select id="getPageEntryList" resultMap="EntryListResultMap">
+        SELECT l.* FROM WXJY_ENTRY_LIST l WHERE 1=1
+        <if test="entryId != null and entryId != ''">
+            AND l.ENTRY_ID = #{entryId}
+        </if>
+        ORDER BY l.G_NO
+    </select>
+</mapper>