From 1578d80644a988af0382d4e5b24ed95652d5d326 Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Wed, 11 Feb 2026 18:06:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=B3=A8=E9=94=80=E5=8F=AF?=
 =?UTF-8?q?=E6=9F=A5=E5=88=B0=E6=8B=9F=E5=BC=BA=E5=88=B6=E6=B3=A8=E9=94=80?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=9C=9F=E9=97=B4=E5=92=8C=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=9C=9F=E6=BB=A1=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../force/entity/querydto/ForceDeregisterSpeQueryDto.java | 3 +++
 .../service/impl/XrForceDeregisterSpeServiceImpl.java     | 8 ++++----
 .../mapper/aiccs/force/XrForceDeregisterSpeMapper.xml     | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java
index c71e35e..bf9c48e 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java
@@ -100,4 +100,7 @@ public class ForceDeregisterSpeQueryDto extends BaseParamDto implements Serializ
     @ApiModelProperty("映射后的登记机关")
     private String acceptRegorg;
 
+    @ApiModelProperty("拟强制注销结果数组（国标C13044）")
+    private List<String> forceResList;
+
 }
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
index f28dd94..0a94a22 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
@@ -773,16 +773,16 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
     public IPage<XrForceDeregisterSpe> forceDeregisterPageByRegOrg(BaseQuery<ForceDeregisterSpeQueryDto> query, AICUser user) {
         ForceDeregisterSpeQueryDto entity = query.getEntity(ForceDeregisterSpeQueryDto.class);
         String userRegOrg = user.getRegionID();
-        if (userRegOrg.length() == 6) {
-            userRegOrg = userRegOrg + "000";   //取9位去查
-        }
 
         IPage<XrForceDeregisterSpe> xrForceDeregisterSpeIPage;
         Page<XrForceDeregisterSpe> page = new Page<>(query.getCurrent(), query.getSize());
         entity.setRegOrg(userRegOrg);
-        entity.setForceRes("1");    //只查正在拟强制注销公告中的数据
+//        entity.setForceRes("2");    //只查正在拟强制注销公告中的数据
+        List<String> forceresList = Arrays.asList("1", "2");    //查正在拟强制注销公告中的，和公告期满的数据
+        entity.setForceResList(forceresList);
         entity.setForceType("1");   //只查正在拟强制注销公告
         entity.setStatus("3");  //查审批通过的
+
         if (StringUtils.equals("0", entity.getSoon())) {
             entity.setSoon(null);
         }
diff --git a/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml b/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml
index 845e99f..3bb93f6 100644
--- a/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml
@@ -147,6 +147,12 @@
             <if test="param.forceRes != null and param.forceRes != ''">
                 and biz.forceres = #{param.forceRes}
             </if>
+            <if test="param.forceResList != null and param.forceResList.size() > 0">
+                and biz.forceres in
+                <foreach collection="param.forceResList" item="res" open="(" separator="," close=")">
+                    #{res}
+                </foreach>
+            </if>
             <if test="param.regOrg != null and param.regOrg != ''">
                 and biz.reg_org = #{param.regOrg}
             </if>