XQ-20260414-001: 修正为插入XR_LICCAN_REC表

【修正内容】
- E_LICENSE_NULLIFY_REG是视图，原始表为XR_LICCAN_REC
- 移除新建的LicenseNullifyReg相关文件
- 改用已有的XrLiccanRec实体类
- 修改RevokeServiceImpl.toForcedLogoutEnter()方法

【数据映射】
- XrLiccanRec继承自SuperEntity
- 字段：recId, pripId, entName, uniscId, regno, regOrg, regOrgCn, regType, liccanReason, isoricop, liccanSta, liccanDate

src/main/java/com/chinaweal/aiccs/aiccs/forcedCancellation/entity/LicenseNullifyReg.java

@@ -1,168 +0,0 @@
-package com.chinaweal.aiccs.aiccs.forcedCancellation.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 营业执照作废公告公示表
- * </p>
- *
- * @author auto-generated
- * @since 2026-04-14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName(schema = "aiccs", value = "E_LICENSE_NULLIFY_REG")
-public class LicenseNullifyReg implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 营业执照作废公告公示唯一标识ID，作为主键
-     */
-    @TableId("RECID")
-    private String recId;
-
-    /**
-     * 业务ID
-     */
-    @TableField("BIZSEQID")
-    private String bizseqId;
-
-    /**
-     * 市场主体身份唯一标识代码
-     */
-    @TableField("PRIPID")
-    private String pripid;
-
-    /**
-     * 市场主体的法定名称
-     */
-    @TableField("ENTNAME")
-    private String entName;
-
-    /**
-     * 市场主体的统一社会信用代码
-     */
-    @TableField("UNISCID")
-    private String uniscid;
-
-    /**
-     * 注册号
-     */
-    @TableField("REGNO")
-    private String regNo;
-
-    /**
-     * 市场主体登记机关编码
-     */
-    @TableField("REGORG")
-    private String regOrg;
-
-    /**
-     * 登记机关的中文名称
-     */
-    @TableField("REGORG_CN")
-    private String regOrgCn;
-
-    /**
-     * 登记注册业务类型代码
-     */
-    @TableField("REGTYPE")
-    private String regType;
-
-    /**
-     * 营业执照作废原因编码：1=无法缴回，2=拒不缴回，3=未缴回
-     */
-    @TableField("LICCANREASON")
-    private String licCanReason;
-
-    /**
-     * 营业执照正副本标识：1=正副本，2=正本，3=副本
-     */
-    @TableField("ISORICOP")
-    private String isoriCop;
-
-    /**
-     * 作废声明的详细内容
-     */
-    @TableField("LICCANSTA")
-    private String licCanSta;
-
-    /**
-     * 作废声明的发布日期
-     */
-    @TableField("LICCANDATE")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate licCanDate;
-
-    /**
-     * 营业执照副本编号
-     */
-    @TableField("LICCOPYNO")
-    private String licCopyNo;
-
-    /**
-     * 公告标题
-     */
-    @TableField("NOTICETITLE")
-    private String noticeTitle;
-
-    /**
-     * 公告内容
-     */
-    @TableField("NOTICECONTENT")
-    private String noticeContent;
-
-    /**
-     * 公告起始日期
-     */
-    @TableField("NOTICEFROM")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate noticeFrom;
-
-    /**
-     * 公告截止日期
-     */
-    @TableField("NOTICETO")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate noticeTo;
-
-    /**
-     * 二级部署时的地市标识
-     */
-    @TableField("S_EXT_FROMNODE")
-    private String sExtFromnode;
-
-    /**
-     * 数据初始化或更新的时间戳
-     */
-    @TableField("S_EXT_DATATIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime sExtDatetime;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CREATE_TIME")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("LAUPTIME")
-    private LocalDateTime lauptime;
-
-}

src/main/java/com/chinaweal/aiccs/aiccs/forcedCancellation/mapper/LicenseNullifyRegMapper.java

@@ -1,83 +0,0 @@
-package com.chinaweal.aiccs.aiccs.forcedCancellation.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 营业执照作废公告公示表 Mapper 接口
- * </p>
- *
- * @author auto-generated
- * @since 2026-04-14
- */
-public interface LicenseNullifyRegMapper extends BaseMapper<LicenseNullifyReg> {
-
-    /**
-     * 分页查询营业执照作废公告公示
-     * @param page 分页参数
-     * @param params 查询参数
-     * @return 分页结果
-     */
-    IPage<LicenseNullifyReg> selectByPage(IPage<LicenseNullifyReg> page, @Param("params") Map<String, Object> params);
-
-    /**
-     * 根据业务ID查询营业执照作废公告公示
-     * @param bizseqId 业务ID
-     * @return 营业执照作废公告公示
-     */
-    LicenseNullifyReg selectByBizSeqId(@Param("bizseqId") String bizseqId);
-
-    /**
-     * 根据主体标识查询营业执照作废公告公示
-     * @param pripid 主体身份唯一标识代码
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> selectByPripid(@Param("pripid") String pripid);
-
-    /**
-     * 根据企业名称查询营业执照作废公告公示
-     * @param entName 市场主体的法定名称
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> selectByEntName(@Param("entName") String entName);
-
-    /**
-     * 根据统一社会信用代码查询营业执照作废公告公示
-     * @param uniscid 市场主体的统一社会信用代码
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> selectByUniscid(@Param("uniscid") String uniscid);
-
-    /**
-     * 根据登记机关查询营业执照作废公告公示
-     * @param regOrg 登记机关编码
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> selectByRegOrg(@Param("regOrg") String regOrg);
-
-    /**
-     * 根据作废声明发布日期查询
-     * @param licCanDate 作废声明的发布日期
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> selectByLicCanDate(@Param("licCanDate") LocalDate licCanDate);
-
-    /**
-     * 根据主体标识和日期范围查询
-     * @param pripid 主体身份唯一标识代码
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> selectByPripidAndDateRange(@Param("pripid") String pripid,
-                                                       @Param("startDate") LocalDate startDate,
-                                                       @Param("endDate") LocalDate endDate);
-}

src/main/java/com/chinaweal/aiccs/aiccs/forcedCancellation/service/LicenseNullifyRegService.java

@@ -1,78 +0,0 @@
-package com.chinaweal.aiccs.aiccs.forcedCancellation.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg;
-import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService;
-
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * <p>
- * 营业执照作废公告公示表 服务类
- * </p>
- *
- * @author auto-generated
- * @since 2026-04-14
- */
-public interface LicenseNullifyRegService extends BaseService<LicenseNullifyReg> {
-
-    /**
-     * 分页查询营业执照作废公告公示
-     * @param page 分页参数
-     * @param entity 查询条件
-     * @return 分页结果
-     */
-    IPage<LicenseNullifyReg> page(IPage<LicenseNullifyReg> page, LicenseNullifyReg entity);
-
-    /**
-     * 根据业务ID查询营业执照作废公告公示
-     * @param bizseqId 业务ID
-     * @return 营业执照作废公告公示
-     */
-    LicenseNullifyReg getByBizSeqId(String bizseqId);
-
-    /**
-     * 根据主体标识查询营业执照作废公告公示
-     * @param pripid 市场主体身份唯一标识代码
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> getByPripid(String pripid);
-
-    /**
-     * 根据企业名称查询营业执照作废公告公示
-     * @param entName 市场主体的法定名称
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> getByEntName(String entName);
-
-    /**
-     * 根据统一社会信用代码查询营业执照作废公告公示
-     * @param uniscid 市场主体的统一社会信用代码
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> getByUniscid(String uniscid);
-
-    /**
-     * 根据登记机关查询营业执照作废公告公示
-     * @param regOrg 市场主体登记机关编码
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> getByRegOrg(String regOrg);
-
-    /**
-     * 根据作废声明发布日期查询
-     * @param licCanDate 作废声明的发布日期
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> getByLicCanDate(LocalDate licCanDate);
-
-    /**
-     * 根据主体标识和日期范围查询
-     * @param pripid 主体身份唯一标识代码
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return 营业执照作废公告公示列表
-     */
-    List<LicenseNullifyReg> getByPripidAndDateRange(String pripid, LocalDate startDate, LocalDate endDate);
-}

src/main/java/com/chinaweal/aiccs/aiccs/forcedCancellation/service/impl/LicenseNullifyRegServiceImpl.java

@@ -1,132 +0,0 @@
-package com.chinaweal.aiccs.aiccs.forcedCancellation.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg;
-import com.chinaweal.aiccs.aiccs.forcedCancellation.mapper.LicenseNullifyRegMapper;
-import com.chinaweal.aiccs.aiccs.forcedCancellation.service.LicenseNullifyRegService;
-import com.chinaweal.aiccs.common.util.StringUtils;
-import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * <p>
- * 营业执照作废公告公示表 服务实现类
- * </p>
- *
- * @author auto-generated
- * @since 2026-04-14
- */
-@Service
-public class LicenseNullifyRegServiceImpl extends BaseServiceImpl<LicenseNullifyRegMapper, LicenseNullifyReg> implements LicenseNullifyRegService {
-
-    @Override
-    public IPage<LicenseNullifyReg> page(IPage<LicenseNullifyReg> page, LicenseNullifyReg entity) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-
-        // 构建查询条件
-        if (StringUtils.isNotBlank(entity.getBizseqId())) {
-            wrapper.eq(LicenseNullifyReg::getBizseqId, entity.getBizseqId());
-        }
-        if (StringUtils.isNotBlank(entity.getPripid())) {
-            wrapper.eq(LicenseNullifyReg::getPripid, entity.getPripid());
-        }
-        if (StringUtils.isNotBlank(entity.getEntName())) {
-            wrapper.like(LicenseNullifyReg::getEntName, entity.getEntName());
-        }
-        if (StringUtils.isNotBlank(entity.getUniscid())) {
-            wrapper.eq(LicenseNullifyReg::getUniscid, entity.getUniscid());
-        }
-        if (StringUtils.isNotBlank(entity.getRegOrg())) {
-            wrapper.eq(LicenseNullifyReg::getRegOrg, entity.getRegOrg());
-        }
-        if (StringUtils.isNotBlank(entity.getRegType())) {
-            wrapper.eq(LicenseNullifyReg::getRegType, entity.getRegType());
-        }
-        if (StringUtils.isNotBlank(entity.getLicCanReason())) {
-            wrapper.eq(LicenseNullifyReg::getLicCanReason, entity.getLicCanReason());
-        }
-        if (StringUtils.isNotBlank(entity.getIsoriCop())) {
-            wrapper.eq(LicenseNullifyReg::getIsoriCop, entity.getIsoriCop());
-        }
-        if (entity.getLicCanDate() != null) {
-            wrapper.ge(LicenseNullifyReg::getLicCanDate, entity.getLicCanDate());
-        }
-        if (StringUtils.isNotBlank(entity.getLicCopyNo())) {
-            wrapper.like(LicenseNullifyReg::getLicCopyNo, entity.getLicCopyNo());
-        }
-        if (StringUtils.isNotBlank(entity.getSExtFromnode())) {
-            wrapper.eq(LicenseNullifyReg::getSExtFromnode, entity.getSExtFromnode());
-        }
-
-        // 按时间降序排序
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-
-        return page(page, wrapper);
-    }
-
-    @Override
-    public LicenseNullifyReg getByBizSeqId(String bizseqId) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(LicenseNullifyReg::getBizseqId, bizseqId);
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-        wrapper.last("limit 1");
-        return getOne(wrapper);
-    }
-
-    @Override
-    public List<LicenseNullifyReg> getByPripid(String pripid) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(LicenseNullifyReg::getPripid, pripid);
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-        return list(wrapper);
-    }
-
-    @Override
-    public List<LicenseNullifyReg> getByEntName(String entName) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(LicenseNullifyReg::getEntName, entName);
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-        return list(wrapper);
-    }
-
-    @Override
-    public List<LicenseNullifyReg> getByUniscid(String uniscid) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(LicenseNullifyReg::getUniscid, uniscid);
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-        return list(wrapper);
-    }
-
-    @Override
-    public List<LicenseNullifyReg> getByRegOrg(String regOrg) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(LicenseNullifyReg::getRegOrg, regOrg);
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-        return list(wrapper);
-    }
-
-    @Override
-    public List<LicenseNullifyReg> getByLicCanDate(LocalDate licCanDate) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(LicenseNullifyReg::getLicCanDate, licCanDate);
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-        return list(wrapper);
-    }
-
-    @Override
-    public List<LicenseNullifyReg> getByPripidAndDateRange(String pripid, LocalDate startDate, LocalDate endDate) {
-        LambdaQueryWrapper<LicenseNullifyReg> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(LicenseNullifyReg::getPripid, pripid);
-        wrapper.ge(LicenseNullifyReg::getLicCanDate, startDate);
-        wrapper.le(LicenseNullifyReg::getLicCanDate, endDate);
-        wrapper.orderByDesc(LicenseNullifyReg::getSExtDatetime);
-        return list(wrapper);
-    }
-}

src/main/java/com/chinaweal/aiccs/aiccs/revoke/service/impl/RevokeServiceImpl.java

@@ -19,10 +19,10 @@ import com.chinaweal.aiccs.aiccs.dict.entity.CmsDictCode;
 import com.chinaweal.aiccs.aiccs.dict.service.CmsDictCodeService;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.ForceLogoutNotice;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.ForceLogoutNoticeDetail;
-import com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg;
+import com.chinaweal.aiccs.aiccs.force.entity.XrLiccanRec;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.service.ForceLogoutNoticeDetailService;
 import com.chinaweal.aiccs.aiccs.forcedCancellation.service.ForceLogoutNoticeService;
-import com.chinaweal.aiccs.aiccs.forcedCancellation.service.LicenseNullifyRegService;
+import com.chinaweal.aiccs.aiccs.force.service.IXrLiccanRecService;
 import com.chinaweal.aiccs.aiccs.inspect.service.TSWorkNoService;
 import com.chinaweal.aiccs.aiccs.revoke.entity.*;
 import com.chinaweal.aiccs.aiccs.revoke.entity.dto.BizRevEntAttachDto;
@@ -99,7 +99,7 @@ public class RevokeServiceImpl implements IRevokeProcessService {
     @Autowired
     private ForceLogoutNoticeService forceLogoutNoticeService;
     @Autowired
-    private LicenseNullifyRegService licenseNullifyRegService;
+    private IXrLiccanRecService xrLiccanRecService;
 
     @Override
     public void processControl(RevokeProcessDto revokeProcessDto, Tsrevtasklist taskList, Tsbizrevlist tsbizrevlist,
@@ -589,37 +589,28 @@ public class RevokeServiceImpl implements IRevokeProcessService {
 
         forceLogoutNoticeService.deactivationNotice(bizseq,loginUser,tsbizrevlist,taskList);
 
-        // 生成营业执照作废公告公示数据
+        // 生成营业执照作废声明数据
         for (ForceLogoutNoticeDetail detail : forceLogoutNoticeDetailList) {
             // 跳过已剔除的企业
             if ("1".equals(detail.getIsRemove())) {
                 continue;
             }
 
-            LicenseNullifyReg nullifyReg = new LicenseNullifyReg();
-            nullifyReg.setRecId(UUID.randomUUID().toString());
-            nullifyReg.setBizseqId(detail.getBizseqId());
-            nullifyReg.setPripid(detail.getPripid());
-            nullifyReg.setEntName(detail.getEntName());
-            nullifyReg.setUniscid(detail.getUniscid());
-            nullifyReg.setRegNo(detail.getRegNo());
-            nullifyReg.setRegOrg(detail.getRegOrg());
-            nullifyReg.setRegOrgCn(detail.getRegOrgCn());
-            nullifyReg.setRegType("FORCE_LOGOUT");
-            nullifyReg.setLicCanReason("1");
-            nullifyReg.setIsoriCop("1");
-            nullifyReg.setLicCanSta("营业执照因强制注销公告作废");
-            nullifyReg.setLicCanDate(LocalDate.now());
-            nullifyReg.setNoticeTitle(forceLogoutNotice.getNoticeTitle());
-            nullifyReg.setNoticeContent(forceLogoutNotice.getNoticeContent());
-            nullifyReg.setNoticeFrom(forceLogoutNotice.getNoticeFrom());
-            nullifyReg.setNoticeTo(forceLogoutNotice.getNoticeTo());
-            nullifyReg.setSExtFromnode(detail.getSExtFromnode());
-            nullifyReg.setSExtDatetime(LocalDateTime.now());
-            nullifyReg.setCreateTime(LocalDateTime.now());
-            nullifyReg.setLauptime(LocalDateTime.now());
+            XrLiccanRec liccanRec = new XrLiccanRec();
+            liccanRec.setRecId(UUID.randomUUID().toString());
+            liccanRec.setPripId(detail.getPripid());
+            liccanRec.setEntName(detail.getEntName());
+            liccanRec.setUniscId(detail.getUniscid());
+            liccanRec.setRegno(detail.getRegNo());
+            liccanRec.setRegOrg(detail.getRegOrg());
+            liccanRec.setRegOrgCn(detail.getRegOrgCn());
+            liccanRec.setRegType("FORCE_LOGOUT");
+            liccanRec.setLiccanReason("1");
+            liccanRec.setIsoricop("1");
+            liccanRec.setLiccanSta("营业执照因强制注销公告作废");
+            liccanRec.setLiccanDate(LocalDate.now());
 
-            licenseNullifyRegService.save(nullifyReg);
+            xrLiccanRecService.save(liccanRec);
         }
 
     }

src/main/resources/mybatis/mapper/aiccs/forcedCancellation/LicenseNullifyRegMapper.xml

@@ -1,104 +0,0 @@
-<?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="com.chinaweal.aiccs.aiccs.forcedCancellation.mapper.LicenseNullifyRegMapper">
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        RECID, BIZSEQID, PRIPID, ENTNAME, UNISCID, REGNO, REGORG, REGORG_CN, REGTYPE, LICCANREASON, ISORICOP, LICCANSTA, LICCANDATE, LICCOPYNO, NOTICETITLE, NOTICECONTENT, NOTICEFROM, NOTICETO, S_EXT_FROMNODE, S_EXT_DATATIME, CREATE_TIME, LAUPTIME
-    </sql>
-
-    <!-- 分页查询营业执照作废公告公示 -->
-    <select id="selectByPage" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        <where>
-            <if test="params.bizseqId != null and params.bizseqId != ''">
-                AND BIZSEQID = #{params.bizseqId}
-            </if>
-            <if test="params.pripid != null and params.pripid != ''">
-                AND PRIPID = #{params.pripid}
-            </if>
-            <if test="params.entName != null and params.entName != ''">
-                AND ENTNAME LIKE CONCAT('%', #{params.entName}, '%')
-            </if>
-            <if test="params.uniscid != null and params.uniscid != ''">
-                AND UNISCID = #{params.uniscid}
-            </if>
-            <if name="params.regOrg != null and params.regOrg != ''">
-                AND REGORG = #{params.regOrg}
-            </if>
-            <if test="params.licCanDate != null">
-                AND LICCANDATE = #{params.licCanDate}
-            </if>
-        </where>
-        ORDER BY S_EXT_DATATIME DESC
-    </select>
-
-    <!-- 根据业务ID查询营业执照作废公告公示 -->
-    <select id="selectByBizSeqId" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        WHERE BIZSEQID = #{bizseqId}
-        ORDER BY S_EXT_DATATIME DESC
-        LIMIT 1
-    </select>
-
-    <!-- 根据主体标识查询营业执照作废公告公示 -->
-    <select id="selectByPripid" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        WHERE PRIPID = #{pripid}
-        ORDER BY S_EXT_DATATIME DESC
-    </select>
-
-    <!-- 根据企业名称查询营业执照作废公告公示 -->
-    <select id="selectByEntName" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        WHERE ENTNAME LIKE CONCAT('%', #{entName}, '%')
-        ORDER BY S_EXT_DATATIME DESC
-    </select>
-
-    <!-- 根据统一社会信用代码查询营业执照作废公告公示 -->
-    <select id="selectByUniscid" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        WHERE UNISCID = #{uniscid}
-        ORDER BY S_EXT_DATATIME DESC
-    </select>
-
-    <!-- 根据登记机关查询营业执照作废公告公示 -->
-    <select id="selectByRegOrg" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        WHERE REGORG = #{regOrg}
-        ORDER BY S_EXT_DATATIME DESC
-    </select>
-
-    <!-- 根据作废声明发布日期查询 -->
-    <select id="selectByLicCanDate" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        WHERE LICCANDATE = #{licCanDate}
-        ORDER BY S_EXT_DATATIME DESC
-    </select>
-
-    <!-- 根据主体标识和日期范围查询 -->
-    <select id="selectByPripidAndDateRange" resultType="com.chinaweal.aiccs.aiccs.forcedCancellation.entity.LicenseNullifyReg">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM AICCS.E_LICENSE_NULLIFY_REG
-        WHERE PRIPID = #{pripid}
-        AND LICCANDATE >= #{startDate}
-        AND LICCANDATE &lt;= #{endDate}
-        ORDER BY S_EXT_DATATIME DESC
-    </select>
-
-</mapper>