From 8f7f5201eae4f1ccb12659cfeb4b4e7d24eca121 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 20 Jul 2026 14:10:13 +0800 Subject: [PATCH 1/5] =?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 --- .../basic/info/web/CorpInfoController.java | 4 ++-- .../info/command/query/CorpInfoQueryExe.java | 5 +++-- .../info/service/CorpInfoServiceImpl.java | 4 ++-- .../basic/info/api/CorpInfoServiceI.java | 2 +- .../basic/info/dto/CorpUserStatisticQry.java | 8 ++++++++ .../basic/info/dto/CorpUserSummaryQry.java | 19 +++++++++++++++++++ .../persistence/mapper/CorpInfoMapper.java | 2 +- .../repository/CorpInfoRepository.java | 2 +- .../impl/CorpInfoRepositoryImpl.java | 4 ++-- .../main/resources/mapper/CorpInfoMapper.xml | 18 ++++++++++++++++++ 10 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index e9fe3cee..76a003cc 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -165,8 +165,8 @@ public class CorpInfoController { @ApiOperation("可视化大屏-企业用户汇总") @PostMapping("/corpUserSummary") - public SingleResponse corpUserSummary() { - return SingleResponse.of(corpInfoService.corpUserSummary()); + public SingleResponse corpUserSummary(@Validated @RequestBody CorpUserSummaryQry qry) { + return SingleResponse.of(corpInfoService.corpUserSummary(qry)); } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index 07a30059..b6a433b1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -323,8 +323,9 @@ public class CorpInfoQueryExe { return PageResponse.of(list, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - public CorpUserSummaryCO corpUserSummary() { - CorpUserSummaryDO corpUserSummaryDO = corpInfoRepository.corpUserSummary(); + public CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + CorpUserSummaryDO corpUserSummaryDO = corpInfoRepository.corpUserSummary(params); CorpUserSummaryCO corpUserSummaryCO = new CorpUserSummaryCO(); BeanUtils.copyProperties(corpUserSummaryDO, corpUserSummaryCO); return corpUserSummaryCO; diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 04a3fb7e..b679dbaf 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -153,8 +153,8 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { } @Override - public CorpUserSummaryCO corpUserSummary() { - return corpInfoQueryExe.corpUserSummary(); + public CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry) { + return corpInfoQueryExe.corpUserSummary(qry); } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java index 6912c547..92f80921 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java @@ -58,6 +58,6 @@ public interface CorpInfoServiceI { PageResponse corpUserStatisticPage(CorpUserStatisticQry qry); - CorpUserSummaryCO corpUserSummary(); + CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry); } 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 ca248eec..986a6ba0 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 @@ -1,6 +1,7 @@ package com.zcloud.basic.info.dto; import com.alibaba.cola.dto.PageQuery; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,4 +21,11 @@ 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") + private Integer portArea; + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long 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 new file mode 100644 index 00000000..7b27ff0a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java @@ -0,0 +1,19 @@ +package com.zcloud.basic.info.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 可视化大屏企业用户汇总查询参数 + */ +@Data +public class CorpUserSummaryQry { + + @JsonProperty("port_area") + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "port_area") + private Integer portArea; + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; +} 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 2cb78589..3aefc3af 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 @@ -36,7 +36,7 @@ public interface CorpInfoMapper extends BaseMapper { IPage corpUserStatisticPage(IPage iPage, Map params); - CorpUserSummaryDO corpUserSummary(); + CorpUserSummaryDO corpUserSummary(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java index bade08e0..fde6f1d8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java @@ -49,6 +49,6 @@ public interface CorpInfoRepository extends BaseRepository { PageResponse corpUserStatisticPage(Map parmas); - CorpUserSummaryDO corpUserSummary(); + CorpUserSummaryDO corpUserSummary(Map parmas); } 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 05385d4e..8a994d5e 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 @@ -342,8 +342,8 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl params) { + return corpInfoMapper.corpUserSummary(params); } } diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index d098fc85..c4b5cff2 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -99,6 +99,12 @@ AND c.corp_name like concat('%',#{params.likeCorpName},'%') + + AND c.port_area = #{params.portArea} + + + AND c.id = #{params.corpinfoId} + ORDER BY IFNULL(u.userCount, 0) DESC, IFNULL(d.departmentCount, 0) DESC, c.corp_order ASC, c.create_time DESC @@ -111,9 +117,21 @@ FROM user u INNER JOIN corp_info c ON c.id = u.corpinfo_id AND c.delete_enum = 'FALSE' WHERE u.delete_enum = 'FALSE' + + AND c.port_area = #{params.portArea} + + + AND c.id = #{params.corpinfoId} + ), 0) AS userCount FROM corp_info c WHERE c.delete_enum = 'FALSE' + + AND c.port_area = #{params.portArea} + + + AND c.id = #{params.corpinfoId} + From d868f6439534835c905d0bf328d2142709b4013b Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 20 Jul 2026 14:54:54 +0800 Subject: [PATCH 2/5] =?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"); From 35c9818f2cc71d8bcc60d201023870bf5e51aa17 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 21 Jul 2026 08:54:53 +0800 Subject: [PATCH 3/5] =?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=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/basic/info/web/CorpInfoController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index 76a003cc..c981153b 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -169,5 +169,11 @@ public class CorpInfoController { return SingleResponse.of(corpInfoService.corpUserSummary(qry)); } + @ApiOperation("可视化大屏-企业列表") + @PostMapping("/corpListAll") + public MultiResponse corpListAll(@RequestBody CorpInfoQry corpInfoQry) { + return corpInfoService.listAll(corpInfoQry); + } + } From 816d82f23ef4fa3bb98dc97156429b438761e481 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 22 Jul 2026 08:40:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(img-files):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 getDelete 接口用于删除单个图片文件 - 新增 getIds 接口用于批量删除图片文件 (cherry picked from commit 8ff5a196541f6c63ab189e0c67c35e8861994f4c) --- .../zcloud/basic/info/web/ImgFilesController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/ImgFilesController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/ImgFilesController.java index 925c8b26..3fa1696c 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/ImgFilesController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/ImgFilesController.java @@ -81,6 +81,19 @@ public class ImgFilesController { imgFilesService.removeBatch(ids); return SingleResponse.buildSuccess(); } + @ApiOperation("删除") + @GetMapping("/getDelete") + public Response getDelete(@RequestParam String filePath) { + imgFilesService.removeFile(filePath); + return Response.buildSuccess(); + } + + @ApiOperation("删除多个") + @GetMapping("/getIds") + public Response getIds(@RequestParam Long[] ids) { + imgFilesService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } @ApiOperation("修改") @PutMapping("/edit") From c4da5decd41eb30e3a456686564488699eed0c53 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 24 Jul 2026 15:07:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(corp):=20=E6=B7=BB=E5=8A=A0=E6=B8=AF?= =?UTF-8?q?=E5=8C=BA=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=94=A8=E6=88=B7=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/command/CorpInfoUpdateExe.java | 12 ++++++++++++ .../zcloud/basic/info/domain/model/CorpInfoE.java | 2 ++ .../src/main/resources/mapper/CorpInfoMapper.xml | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java index 08db9da8..98afedc1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java @@ -69,6 +69,18 @@ public class CorpInfoUpdateExe { } BeanUtils.copyProperties(corpInfoUpdateCmd, corpInfoE); + // + if("1".equals(corpInfoE.getAreaCode())){ + //东港区 + corpInfoE.setPortArea(2); + } + if("2".equals(corpInfoE.getAreaCode())){ + //西港区 + corpInfoE.setPortArea(3); + } + + + boolean res = corpInfoGateway.update(corpInfoE); if (!res) { throw new BizException("修改失败"); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index ad643c89..7a60cdc5 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java @@ -188,6 +188,8 @@ public class CorpInfoE extends BaseE { @ApiModelProperty(value = "经营范围", name = "natureBusiness") private String natureBusiness; + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西") + private Integer portArea; public void initPassWord(Integer type) { String encrypt = Sm2Util.encryptHex(MD5.md5(CorpTypeEnum.getPasswordByCode(type)), publicKey); this.setPassword(encrypt); diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index c4b5cff2..872c8ad9 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -86,7 +86,7 @@ corpinfo_id, COUNT(1) AS userCount FROM user - WHERE delete_enum = 'FALSE' + WHERE delete_enum = 'FALSE' and id!=corpinfo_id and employment_flag=1 GROUP BY corpinfo_id ) u ON u.corpinfo_id = c.id WHERE c.delete_enum = 'FALSE' @@ -116,7 +116,7 @@ SELECT COUNT(1) FROM user u INNER JOIN corp_info c ON c.id = u.corpinfo_id AND c.delete_enum = 'FALSE' - WHERE u.delete_enum = 'FALSE' + WHERE u.delete_enum = 'FALSE' and u.employment_flag=1 AND c.port_area = #{params.portArea}