From d868f6439534835c905d0bf328d2142709b4013b Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 20 Jul 2026 14:54:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(corp):=20=E4=B8=BA=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=8C=96=E5=A4=A7=E5=B1=8F=E4=BC=81=E4=B8=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/bootstrap.yml | 8 ++++---- .../main/java/com/zcloud/basic/info/dto/CorpInfoQry.java | 3 +++ .../com/zcloud/basic/info/dto/CorpUserStatisticQry.java | 3 +-- .../com/zcloud/basic/info/dto/CorpUserSummaryQry.java | 3 +-- .../basic/info/persistence/dataobject/CorpInfoDO.java | 4 ++++ .../basic/info/persistence/mapper/CorpInfoMapper.java | 4 ++-- .../repository/impl/CorpInfoRepositoryImpl.java | 1 + 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index ea7eb2ef..f467a2cb 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -3,8 +3,8 @@ spring: import: # - classpath:nacos.yml # - classpath:sdk.yml -# - classpath:nacos-prod.yml -# - classpath:sdk-prod.yml - - classpath:nacos-prod2.yml - - classpath:sdk-prod2.yml + - classpath:nacos-prod.yml + - classpath:sdk-prod.yml +# - classpath:nacos-prod2.yml +# - classpath:sdk-prod2.yml - classpath:swagger.yml diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java index 49b53559..5125820b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java @@ -66,6 +66,9 @@ public class CorpInfoQry { @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true) private Integer enterpriseType; + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer eqPortArea; + @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseTypeList", required = true) private List enterpriseTypeList; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java index 986a6ba0..a80918de 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java @@ -22,8 +22,7 @@ public class CorpUserStatisticQry extends PageQuery { @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType") private Integer enterpriseType; - @JsonProperty("port_area") - @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "port_area") + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") private Integer portArea; @ApiModelProperty(value = "企业id", name = "corpinfoId") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java index 7b27ff0a..f4af151b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java @@ -10,8 +10,7 @@ import lombok.Data; @Data public class CorpUserSummaryQry { - @JsonProperty("port_area") - @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "port_area") + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") private Integer portArea; @ApiModelProperty(value = "企业id", name = "corpinfoId") diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java index 4a5a0dc5..482e3f52 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java @@ -260,5 +260,9 @@ public class CorpInfoDO extends BaseDO { @ApiModelProperty(value = "经营范围", name = "natureBusiness") private String natureBusiness; + + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西") + private Integer portArea; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java index 3aefc3af..7ce772d0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java @@ -34,9 +34,9 @@ public interface CorpInfoMapper extends BaseMapper { IPage selectUserPageNoPms(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); - IPage corpUserStatisticPage(IPage iPage, Map params); + IPage corpUserStatisticPage(IPage iPage, @Param("params") Map params); - CorpUserSummaryDO corpUserSummary(Map params); + CorpUserSummaryDO corpUserSummary(@Param("params") Map params); } 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 8a994d5e..d6c32513 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 @@ -138,6 +138,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl enterpriseTypeList = (List) params.get("enterpriseTypeList");