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..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 @@ -165,8 +165,14 @@ 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)); + } + + @ApiOperation("可视化大屏-企业列表") + @PostMapping("/corpListAll") + public MultiResponse corpListAll(@RequestBody CorpInfoQry corpInfoQry) { + return corpInfoService.listAll(corpInfoQry); } } 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") 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-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/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 ca248eec..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 @@ -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,10 @@ public class CorpUserStatisticQry extends PageQuery { @ApiModelProperty(value = "企业类型1:监管 2:企业 3:相关方", name = "enterpriseType") private Integer enterpriseType; + + @ApiModelProperty(value = "港区,1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + 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..f4af151b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java @@ -0,0 +1,18 @@ +package com.zcloud.basic.info.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 可视化大屏企业用户汇总查询参数 + */ +@Data +public class CorpUserSummaryQry { + + @ApiModelProperty(value = "港区,1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; +} 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 f9962aeb..3ec9f299 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 @@ -186,6 +186,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/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 b51652b6..98ce0692 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 @@ -38,9 +38,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(); + CorpUserSummaryDO corpUserSummary(@Param("params") 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 64f2262b..3db4d1f9 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 @@ -52,6 +52,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 f7ad057c..af80ef99 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 @@ -139,6 +139,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl enterpriseTypeList = (List) params.get("enterpriseTypeList"); @@ -354,8 +355,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 0c61675c..84799507 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -133,7 +133,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' @@ -146,6 +146,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 @@ -157,10 +163,22 @@ 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} + + + 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} +