diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java index e92c454..c7e3bcc 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java @@ -27,5 +27,11 @@ public class CorpInfoPageQry extends PageQuery { private Long eqcorpinfoId; private String likecorpName; private String eqtype; + /**、 + * 区分监管、企业、相关方 + * 2025-11-05 罗刚提出将相关方中的普通相关方企业、驻港单位、货主单位合并成同一个列表 + * 0:监管 1:企业 2:相关方 + */ + private String corpType; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 9257341..00d368d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -14,6 +14,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -33,6 +34,13 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + if ("0".equals(params.get("corpType"))){ + queryWrapper.eq("type", "2"); + } else if ("1".equals(params.get("corpType"))) { + queryWrapper.in("type", Arrays.asList("0", "1")); + }else { + queryWrapper.in("type", Arrays.asList("3", "4","5")); + } IPage result = corpInfoMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); }