feat(corp): 为可视化大屏企业用户汇总接口添加查询参数支持

start/src/main/resources/bootstrap.yml

@@ -3,8 +3,8 @@ spring:
     import:
 #      - classpath:nacos.yml
 #      - classpath:sdk.yml
-#      - classpath:nacos-prod.yml
+      - classpath:nacos-prod.yml
-#      - classpath:sdk-prod.yml
+      - classpath:sdk-prod.yml
-      - classpath:nacos-prod2.yml
+#      - classpath:nacos-prod2.yml
-      - classpath:sdk-prod2.yml
+#      - classpath:sdk-prod2.yml
       - classpath:swagger.yml

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<Integer> enterpriseTypeList;
     @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)

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 = "portArea")
-    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "port_area")
     private Integer portArea;
 
     @ApiModelProperty(value = "企业id", name = "corpinfoId")

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 = "portArea")
-    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "port_area")
     private Integer portArea;
 
     @ApiModelProperty(value = "企业id", name = "corpinfoId")

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;
+
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java

@@ -34,9 +34,9 @@ public interface CorpInfoMapper extends BaseMapper<CorpInfoDO> {
 
     IPage<CorpInfoDO> selectUserPageNoPms(IPage<CorpInfoDO> iPage, @Param("ew") QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms);
 
-    IPage<CorpUserStatisticDO> corpUserStatisticPage(IPage<CorpUserStatisticDO> iPage, Map<String, Object> params);
+    IPage<CorpUserStatisticDO> corpUserStatisticPage(IPage<CorpUserStatisticDO> iPage, @Param("params") Map<String, Object> params);
 
-    CorpUserSummaryDO corpUserSummary(Map<String, Object> params);
+    CorpUserSummaryDO corpUserSummary(@Param("params") Map<String, Object> params);
 
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -138,6 +138,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         if (CollUtil.isNotEmpty(enterpriseType)) {
             queryWrapper.in("type", enterpriseType);
         }
+
         if (params.get("enterpriseTypeList") != null
                 && params.get("enterpriseTypeList") instanceof List){
             List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");