From f302bb372edddc57a42c154c87c37cd7702f49ef Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 25 Mar 2023 15:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E8=B4=A7=E7=82=B9=E5=92=8C=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BuildWuyeCompanyController.java | 10 ++++++++++ .../BuildingCommunityController.java | 17 ++++++++++++----- .../service/IBuildWuyeCompanyService.java | 4 ++++ .../service/IBuildingCommunityService.java | 4 ++++ .../impl/BuildWuyeCompanyServiceImpl.java | 10 ++++++++++ .../impl/BuildingCommunityServiceImpl.java | 19 ++++++++++++++----- .../build/mapper/BuildWuyeCompanyMapper.java | 4 ++++ .../build/mapper/BuildingCommunityMapper.java | 4 ++++ .../mapper/build/BuildWuyeCompanyMapper.xml | 16 ++++++++++++++++ .../mapper/build/ComminutyMapper.xml | 8 ++++++++ 10 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 mallplus-mbg/src/main/resources/mapper/build/BuildWuyeCompanyMapper.xml diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java index 6e37026..3ab55ca 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java @@ -63,6 +63,11 @@ public class BuildWuyeCompanyController { @PreAuthorize("hasAuthority('build:wuyeCompany:create')") public Object saveBuildWuyeCompany(@RequestBody BuildWuyeCompany entity) { try { + //查询是否存在该社区 + int count = IBuildWuyeCompanyService.selectByName(entity.getName()); + if(count>0){ + return new CommonResult().failed("该社区已存在"); + } entity.setStatus(StatusEnum.AuditType.SUCESS.code()); if (IBuildWuyeCompanyService.saveCompany(entity)) { return new CommonResult().success(); @@ -80,6 +85,11 @@ public class BuildWuyeCompanyController { @PreAuthorize("hasAuthority('build:wuyeCompany:update')") public Object updateBuildWuyeCompany(@RequestBody BuildWuyeCompany entity) { try { + //查询是否存在该社区 + int count = IBuildWuyeCompanyService.selectByNameAndId(entity.getName(),entity.getId()); + if(count>0){ + return new CommonResult().failed("该社区已存在"); + } if (IBuildWuyeCompanyService.updateById(entity)) { return new CommonResult().success(); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java index a8b44e4..38b1cda 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java @@ -49,8 +49,8 @@ public class BuildingCommunityController { ) { try { QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(entity.getKeyword())){ - qw.like("bc.name",entity.getKeyword()); + if (StringUtils.isNotBlank(entity.getKeyword())) { + qw.like("bc.name", entity.getKeyword()); } IPage page = IBuildingCommunityService.pagerList(new Page(pageNum, pageSize), qw); return new CommonResult().success(page); @@ -70,10 +70,12 @@ public class BuildingCommunityController { entity.setCreateTime(new Date()); entity.setStatus(StatusEnum.AuditType.SUCESS.code()); if (ValidatorUtils.empty(entity.getCompanyId())) { - // entity.setCompanyId(UserUtils.getCurrentMember().getStoreId()); + return new CommonResult().failed("请选择物业啊"); } - if (ValidatorUtils.empty(entity.getCompanyId())) { - return new CommonResult().failed("请选择物业攻啊"); + //判断该物业是否存在相同小区的名称 + int count = IBuildingCommunityService.selectByNameAndCompanyId(entity.getName(),entity.getCompanyId()); + if(count > 0){ + return new CommonResult().failed("该取货点已存在"); } if (IBuildingCommunityService.saveCommunity(entity)) { return new CommonResult().success(); @@ -91,6 +93,11 @@ public class BuildingCommunityController { public Object updateBuildingCommunity(@RequestBody BuildingCommunity entity) { try { + //判断该物业是否存在相同小区的名称 + int count = IBuildingCommunityService.selectByNameAndCompanyIdAndId(entity.getName(),entity.getCompanyId(),entity.getId()); + if(count > 0){ + return new CommonResult().failed("该取货点已存在"); + } if (IBuildingCommunityService.updateById(entity)) { return new CommonResult().success(); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java index 2ca750f..2de0ffe 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java @@ -14,4 +14,8 @@ import com.zscat.mallplus.build.entity.BuildWuyeCompany; public interface IBuildWuyeCompanyService extends IService { boolean saveCompany(BuildWuyeCompany entity); + + int selectByName(String name); + + int selectByNameAndId(String name, Long id); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java index 7929fe4..5383621 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java @@ -19,4 +19,8 @@ public interface IBuildingCommunityService extends IService { boolean saveCommunity(BuildingCommunity entity); IPage pagerList(Page buildingCommunityPage, QueryWrapper buildingCommunityQueryWrapper); + + int selectByNameAndCompanyId(String name, Long companyId); + + int selectByNameAndCompanyIdAndId(String name, Long companyId, Long id); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java index 3fccbca..41a9752 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java @@ -67,4 +67,14 @@ public class BuildWuyeCompanyServiceImpl extends ServiceImpl page = baseMapper.pagerList(buildingCommunityPage,buildingCommunityQueryWrapper); return page; } + + @Override + public int selectByNameAndCompanyId(String name, Long companyId) { + return baseMapper.selectByNameAndCompanyId(name,companyId); + } + + @Override + public int selectByNameAndCompanyIdAndId(String name, Long companyId, Long id) { + return baseMapper.selectByNameAndCompanyIdAndId(name,companyId,id); + } } diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java index 6a394d8..339e038 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java @@ -2,6 +2,7 @@ package com.zscat.mallplus.build.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zscat.mallplus.build.entity.BuildWuyeCompany; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +14,7 @@ import com.zscat.mallplus.build.entity.BuildWuyeCompany; */ public interface BuildWuyeCompanyMapper extends BaseMapper { + int selectByName(String name); + + int selectByNameAndId(@Param("name") String name, @Param("id") Long id); } diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java index 2fe5292..ca56406 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java @@ -31,4 +31,8 @@ public interface BuildingCommunityMapper extends BaseMapper { @Param("pageSize") Integer pageSize); IPage pagerList(Page buildingCommunityPage, @Param(Constants.WRAPPER)QueryWrapper buildingCommunityQueryWrapper); + + int selectByNameAndCompanyId(@Param("name") String name, @Param("companyId") Long companyId); + + int selectByNameAndCompanyIdAndId(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id); } diff --git a/mallplus-mbg/src/main/resources/mapper/build/BuildWuyeCompanyMapper.xml b/mallplus-mbg/src/main/resources/mapper/build/BuildWuyeCompanyMapper.xml new file mode 100644 index 0000000..e32ca11 --- /dev/null +++ b/mallplus-mbg/src/main/resources/mapper/build/BuildWuyeCompanyMapper.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml b/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml index 03a624b..f3c6a2e 100644 --- a/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml +++ b/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml @@ -45,4 +45,12 @@ ${ew.sqlSegment} + + + +