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 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 forceDeregisterPageByRegOrg(BaseQuery query, AICUser user) { ForceDeregisterSpeQueryDto entity = query.getEntity(ForceDeregisterSpeQueryDto.class); String userRegOrg = user.getRegionID(); - if (userRegOrg.length() == 6) { - userRegOrg = userRegOrg + "000"; //取9位去查 - } IPage xrForceDeregisterSpeIPage; Page page = new Page<>(query.getCurrent(), query.getSize()); entity.setRegOrg(userRegOrg); - entity.setForceRes("1"); //只查正在拟强制注销公告中的数据 +// entity.setForceRes("2"); //只查正在拟强制注销公告中的数据 + List 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 @@ and biz.forceres = #{param.forceRes} + + and biz.forceres in + + #{res} + + and biz.reg_org = #{param.regOrg}