From 9611e6f5b1fed4e059e7144564cb968425acdbb7 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Mon, 23 Jun 2025 14:01:24 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=8A=9E=E7=90=86=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1->=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E7=AD=89?= =?UTF-8?q?=E7=BA=A7,=E5=88=86=E5=85=AC=E5=8F=B8=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=9C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/member/base/mapper/CuMemberMapper.java | 2 +- .../com/hzs/member/base/service/ICuMemberService.java | 2 +- .../member/base/service/impl/CuMemberServiceImpl.java | 4 ++-- .../java/com/hzs/member/base/vo/RetailMemberVO.java | 2 ++ .../controller/manage/CuHandleBusinessController.java | 3 +++ .../service/impl/CuHandleBusinessServiceImpl.java | 4 ++-- .../resources/mapper/member/base/CuMemberMapper.xml | 11 +++++++---- .../system/base/service/impl/BdAreaServiceImpl.java | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 001652bd..24e9ad49 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -653,5 +653,5 @@ public interface CuMemberMapper extends BaseMapper { int validateCompanyCount(@Param("gradeValue") Integer gradeValue); - int validateBranchOfficeCount(@Param("areaId") Integer areaId); + int validateBranchOfficeCount(@Param("areaId") Integer areaId, @Param("userId") Long userId); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 16d47981..f8d59564 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -921,5 +921,5 @@ public interface ICuMemberService extends IService { int validateCompanyCount(); - int validateBranchOfficeCount(Integer areaId); + int validateBranchOfficeCount(Integer areaId, Long userId); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 949d1cfb..a1744025 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3175,8 +3175,8 @@ public class CuMemberServiceImpl extends ServiceImpl i } @Override - public int validateBranchOfficeCount(Integer areaId) { - return baseMapper.validateBranchOfficeCount(areaId); + public int validateBranchOfficeCount(Integer areaId, Long userId) { + return baseMapper.validateBranchOfficeCount(areaId, userId); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java index 46745306..a947e253 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java @@ -451,5 +451,7 @@ public class RetailMemberVO implements Serializable { @Excel(name = "是否激活") private String isActivateVal; + private Integer areaId; + private String areaName; } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java index f40579cc..90403cd4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java @@ -413,6 +413,8 @@ public class CuHandleBusinessController extends BaseController { uc.setEndValidityDate(modifiedDate); } nuc.setEndValidityDate(uc.getEndValidityDate()); + nuc.setAreaId(uc.getAreaId()); + cov.setAreaId(uc.getAreaId()); } } } @@ -621,6 +623,7 @@ public class CuHandleBusinessController extends BaseController { if (etv.getBusinessType() == EApprovalBusiness.CHANGE_SETTLEMENT_GRADE.getValue()) { bum.setOldValue(cov.getPkSettleGrade().toString()); bum.setNewValue(newValue(etv.getBusinessValueList())); + bum.setAreaId(cov.getAreaId()); for (GradeDTO gr : gradeList.getData()) { if (etv.getBusinessValueList().get(0).intValue() == gr.getPkId().intValue()) { nbtvo.setNewValue(gr.getGradeName()); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java index 89a6b8b1..8632cee4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java @@ -741,7 +741,7 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl> gradeList = iGradeServiceApi.queryGradeList(pkCountry); - Map gradesMap = gradeList.getData().stream().collect(Collectors.toMap(GradeDTO::getGradeValue, o -> o)); + Map gradesMap = gradeList.getData().stream().collect(Collectors.toMap(GradeDTO::getPkId, o -> o)); List handleBusinessList = handleBusinessVO.getHandleBusinessList(); //获取期数 String localDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); @@ -764,7 +764,7 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl 0) { throw new ServiceException("已存在结算绑定省的分公司用户,不允许重复添加!"); } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index bbbe4400..d7eee39a 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -853,7 +853,7 @@ - pk_settle_grade = #{value} + pk_settle_grade = #{value}, pk_area_id = #{businessMemberList[${index}].areaId} @@ -2296,7 +2296,9 @@ gr.grade_name as pkRegisterGradeVal, grr.grade_name as pkSettleGradeVal, par.member_code parMemberCode, - par.member_name parMemberName + par.member_name parMemberName, + cm.pk_area_id as areaId, + ba.name as areaName FROM cu_member cm inner join CU_MEMBER_ACCOUNT cma on cm.pk_id = cma.PK_MEMBER @@ -2312,6 +2314,7 @@ on cmt.pk_id = cm.pk_team_code left join CU_MEMBER_RETAIL_REGION cmrr on cm.pk_id = cmrr.PK_MEMBER and cmrr.effective = 0 and cmrr.del_flag = 0 + left join bd_area ba on ba.pk_id = cm.pk_area_id WHERE cm.del_flag = 0 and cm.pk_id in ( SELECT cm.PK_ID @@ -2612,10 +2615,10 @@ where rownum = 1 diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java index 28cf91eb..af505ff6 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java @@ -126,7 +126,7 @@ public class BdAreaServiceImpl extends ServiceImpl impleme LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BdArea::getPkCountry, CountryConstants.CHINA_COUNTRY); queryWrapper.eq(BdArea::getParent, parentId); - queryWrapper.apply("pk_id not in (select PK_AREA_ID from cu_member)"); + queryWrapper.apply("pk_id not in (select nvl(PK_AREA_ID, 0) from cu_member)"); queryWrapper.orderByAsc(BdArea::getCode); return baseMapper.selectList(queryWrapper); }