From 66ac4693f7e1db58c1d4ff234cdbe449fa36a447 Mon Sep 17 00:00:00 2001 From: luyan Date: Fri, 2 Jun 2023 09:24:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/CustomerStaffController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index cc174819d8..3c7f1445b0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -95,6 +95,14 @@ public class CustomerStaffController { return new Result(); } + @PostMapping("update") + public Result updateById(@RequestBody CustomerStaffDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + customerStaffService.update(dto); + return new Result(); + } + @DeleteMapping public Result delete(@RequestBody String[] ids) { //效验数据 From 2408d2c2334c641f0caf9765a05eb6aa20184935 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 2 Jun 2023 11:11:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E3=80=91=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4=EF=BC=8C?= =?UTF-8?q?=E5=88=B0=E4=BA=86=E7=A4=BE=E5=8C=BA=E5=B1=82=E7=BA=A7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5=E7=BD=91=E6=A0=BC=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4=E6=95=B0=E9=87=8F=E3=80=82?= =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7=E5=B1=8F=E3=80=91?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=E4=B8=BA=EF=BC=9A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=91=E5=B8=83=E5=88=B0=E5=BD=93=E5=89=8D=E5=85=9A?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8F=8A=E4=B8=8B=E7=BA=A7=E7=9A=84=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/dao/IcPartyActDao.java | 2 +- .../impl/LingShanScreenServiceImpl.java | 13 +++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 2 +- .../java/com/epmet/dao/IcResiUserDao.java | 3 ++- .../impl/LingShanScreenServiceImpl.java | 5 +++-- .../main/resources/mapper/IcResiUserDao.xml | 21 ++++++++++++++++--- 6 files changed, 37 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 4d6fa73c2c..65838a2f05 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -64,7 +64,7 @@ public interface IcPartyActDao extends BaseDao { * @date: 2023/4/14 12:12 PM */ List getPartyActTypeAndQuantity(@Param("customerId") String customerId, - @Param("orgIdPath") String orgIdPath); + @Param("partyOrgIdPath") String partyOrgIdPath); /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 7d94ed82ee..815a6e671c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -115,7 +115,18 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD if (agencyInfo == null) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); } - List l = partyActDao.getPartyActTypeAndQuantity(EpmetRequestHolder.getLoginUserCustomerId(), PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids())); + + // 这里要查询的是，发布到我当前这个组织的活动，而不是我这个组织发布的，所以。。。 + // 先根据行政组织查询到党组织的信息 + // LambdaQueryWrapper q = new LambdaQueryWrapper<>(); + // q.eq(IcPartyOrgEntity::getAgencyId, agencyId); + // IcPartyOrgEntity partyOrg = icPartyOrgDao.selectOne(q); + IcPartyOrgEntity partyOrg = icPartyOrgDao.selectDefaultPartyOrg(agencyId, agencyInfo.getLevel()); + if (partyOrg == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前党组织信息为空，agencyId:" + agencyId, "查询当前党组织信息为空"); + } + + List l = partyActDao.getPartyActTypeAndQuantity(EpmetRequestHolder.getLoginUserCustomerId(), PidUtils.convertPid2OrgIdPath(partyOrg.getId(), partyOrg.getOrgPids())); List type2beReturn = Arrays.asList("wmfwhd", "ljgj", "ztdr"); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 809cc5a470..00be5d9714 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -279,7 +279,7 @@ inner join ic_party_act_type_dict t on (a.ACT_TYPE = t.TYPE_KEY and t.DEL_FLAG = 0 and a.CUSTOMER_ID=t.CUSTOMER_ID) where a.DEL_FLAG = 0 and a.CUSTOMER_ID = #{customerId} - and a.ORG_ID_PATH like CONCAT(#{orgIdPath}, '%') + and a.PUBLISH_ORG_PATH like CONCAT(#{partyOrgIdPath}, '%') group by t.TYPE_KEY diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 4fd2411767..c2b3ee5a71 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -513,7 +513,8 @@ public interface IcResiUserDao extends BaseDao { * @Date: 2023/5/24 9:27 AM */ List countSpecialQtyOfAllSubOrg(@Param("orgIdPath") String orgIdPath, - @Param("specialType") String specialType); + @Param("specialType") String specialType, + @Param("orgLevel") String orgLevel); int countSpecialQtyOfOrg(@Param("orgIdPath") String orgIdPath, @Param("specialType") String specialType); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java index 0d978cfcc1..64d453178b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java @@ -62,7 +62,7 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD } List subOrgs = getResultDataOrThrowsException(govOrgOpenFeignClient.subOrgList(parentAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, null); - List orgIdPaths = subOrgs.stream().map(sub -> PidUtils.convertPid2OrgIdPath(sub.getOrgId(), sub.getPids())).collect(Collectors.toList()); + // List orgIdPaths = subOrgs.stream().map(sub -> PidUtils.convertPid2OrgIdPath(sub.getOrgId(), sub.getPids())).collect(Collectors.toList()); List rl = subOrgs.stream().map(sub -> { LingShanSpecialCrowdStatsByOrgResultDTO t = new LingShanSpecialCrowdStatsByOrgResultDTO(); @@ -105,7 +105,8 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD // if (LingShanSpecialCrowdTypeEnums.JZHZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) { // ol.addAll(jzhzDao.statsCountsByOrgIds(orgIdPaths)); // } - List ol = icResiUserDao.countSpecialQtyOfAllSubOrg(PidUtils.convertPid2OrgIdPath(parentAgencyInfo.getId(), parentAgencyInfo.getPids()), specialType); + List ol = + icResiUserDao.countSpecialQtyOfAllSubOrg(PidUtils.convertPid2OrgIdPath(parentAgencyInfo.getId(), parentAgencyInfo.getPids()), specialType, parentAgencyInfo.getLevel()); // 开始给rl++ for (LingShanSpecialCrowdStatsByOrgResultDTO qtyData : ol) { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 731cfdaa5a..4b00b06cde 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1742,11 +1742,19 @@ select r.* from ic_resi_user r where r.id = #{icResiUserId} - +