diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java index d242b1b526..20e109d604 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java @@ -201,4 +201,14 @@ public class IcPartyMemberDTO implements Serializable { */ private Date updatedTime; + /** + * 头像 + */ + private String headPhoto; + + /** + * 性别 + */ + private Integer gender; + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/LingShanScreenPartyActQtyStatsResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/LingShanScreenPartyActQtyStatsResultDTO.java new file mode 100644 index 0000000000..5b84eee8c6 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/LingShanScreenPartyActQtyStatsResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * @description: agencyId下的党组织活动数统计 + * @param null: + * @return + * @author: WangXianZhang + * @date: 2023/4/14 7:09 PM + */ +@Data +public class LingShanScreenPartyActQtyStatsResultDTO { + + private String type; + + private Collection data; + + @Data + public static class StatsData { + @JsonIgnore + private String orgId; + private String name; + @JsonIgnore + private String actType; + private Integer value; + } +} 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 6d852616a1..4d6fa73c2c 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 @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; @@ -11,10 +12,12 @@ import com.epmet.resi.partymember.dto.partyOrg.form.PartyActStatisFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyActListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.PartyActStatisResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActQtyStatsResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActTypeAndQtyResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -62,4 +65,18 @@ public interface IcPartyActDao extends BaseDao { */ List getPartyActTypeAndQuantity(@Param("customerId") String customerId, @Param("orgIdPath") String orgIdPath); + + + /** + * @description: 找出当前党组织的下级党组织，及其对应的活动数量 + * @param currentPartyOrg: + * @param holdTimeStart: + * @param holdTimeEnd: + * @return + * @author: WangXianZhang + * @date: 2023/4/14 8:36 PM + */ + List actQtyOfPartyOrgStats(@Param("currentPartyOrgId") String currentPartyOrgId, + @Param("holdTimeStart") Date holdTimeStart, + @Param("holdTimeEnd") Date holdTimeEnd); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java index 49a43329ca..4196d68859 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java @@ -1,8 +1,12 @@ package com.epmet.modules.partymember.controller; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partymember.service.LingShanScreenService; +import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActQtyStatsResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActTypeAndQtyResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgCategoryResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgTreeResultDTO; @@ -13,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Date; import java.util.List; @RestController @@ -62,4 +67,42 @@ public class LingShanScreenController { return new Result().ok(l); } + /** + * @description: 党员列表 + * @param partyOrgId: 党组织id + * @return + * @author: WangXianZhang + * @date: 2023/4/14 3:20 PM + */ + @GetMapping("partymemberList") + public Result> partymemberList(@RequestParam("partyOrgId") String partyOrgId) { + List l = lingShanScreenService.partymemberListByPartyOrgId(partyOrgId); + return new Result().ok(l); + } + + /** + * @description: agencyId下的党组织活动数统计 + * @param agencyId: 行政组织id + * @return + * @author: WangXianZhang + * @date: 2023/4/14 7:07 PM + */ + @GetMapping("partyActStats/actQtyOfPartyOrg") + public Result> actQtyOfPartyOrgStats(@RequestParam("agencyId") String agencyId, + @RequestParam("holdTimeStart") String holdTimeStartStr, + @RequestParam("holdTimeEnd") String holdTimeEndStr) { + + Date holdTimeStart; + Date holdTimeEnd; + try { + holdTimeStart = DateUtils.parse(holdTimeStartStr, DateUtils.DATE_TIME_PATTERN); + holdTimeEnd = DateUtils.parse(holdTimeEndStr, DateUtils.DATE_TIME_PATTERN); + } catch (Exception e) { + log.error("日期解析失败，请按指定格式传输：yyyy-MM-dd HH:mm:ss"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "日期解析失败"); + } + List l = lingShanScreenService.actQtyOfPartyOrgStats(agencyId, holdTimeStart, holdTimeEnd); + return new Result>().ok(l); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java index 0f18a60ac5..ea835cddec 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java @@ -29,7 +29,7 @@ public interface IcPartyMemberDao extends BaseDao { * @Author zhaoqifeng * @Date 2022/5/18 17:01 */ - List selectList(IcPartyMemberFromDTO formDTO); + List selectListZqf(IcPartyMemberFromDTO formDTO); /** * @describe: 查询该组织下的党员信息 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java index 1133a77bc1..1c55206f3b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java @@ -158,4 +158,7 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { */ private String field5; + private String headPhoto; + + private Integer gender; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java index 55bb9dd082..8bff76abff 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java @@ -1,9 +1,12 @@ package com.epmet.modules.partymember.service; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActQtyStatsResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActTypeAndQtyResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgCategoryResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgTreeResultDTO; +import java.util.Date; import java.util.List; public interface LingShanScreenService { @@ -33,4 +36,24 @@ public interface LingShanScreenService { * @date: 2023/4/14 1:09 PM */ LingShanScreenPartyOrgTreeResultDTO getPartyOrgTree(String agencyId); + + /** + * @description: 党员列表 + * @param partyOrgId: + * @return + * @author: WangXianZhang + * @date: 2023/4/14 3:22 PM + */ + List partymemberListByPartyOrgId(String partyOrgId); + + /** + * @description: agencyId下的党组织活动数统计 + * @param agencyId: + * @param holdTimeStart: + * @param holdTimeEnd: + * @return + * @author: WangXianZhang + * @date: 2023/4/14 7:27 PM + */ + List actQtyOfPartyOrgStats(String agencyId, Date holdTimeStart, Date holdTimeEnd); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index d9d43ea387..98d737728d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -127,7 +127,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl list = baseDao.selectList(formDTO); + List list = baseDao.selectListZqf(formDTO); PageInfo pageInfo = new PageInfo<>(list); //获取文化程度字典 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 37e4663790..876a1471e4 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 @@ -1,6 +1,8 @@ package com.epmet.modules.partymember.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -9,19 +11,25 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.PidUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActTypeDictDao; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; +import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity; +import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; +import com.epmet.modules.partymember.dao.IcPartyMemberDao; +import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.modules.partymember.service.LingShanScreenService; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; +import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActQtyStatsResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActTypeAndQtyResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgCategoryResultDTO; import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgTreeResultDTO; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -34,6 +42,12 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD @Autowired private IcPartyActDao partyActDao; + @Autowired + private IcPartyMemberDao icPartyMemberDao; + + @Autowired + private IcPartyActTypeDictDao partyActTypeDictDao; + @Autowired private ResiGroupOpenFeignClient groupOpenFeignClient; @@ -101,8 +115,9 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD // 2.组装树了开始 Map lMap = l.stream().collect(Collectors.toMap(e -> e.getId(), Function.identity())); + // 树根组织的id String parentPartyOrgId = null; - + // 最高的组织级别，用于找到树根。初始值给个100，大一点，不影响 Integer maxLevel = 100; // 将组织放入到父组织的children列表中 for (Iterator it = l.iterator(); it.hasNext();) { @@ -116,6 +131,7 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD if (pOrg != null) { pOrg.getChildren().add(e); + // 修剪枝叶 it.remove(); } } @@ -127,4 +143,146 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD r.setList(parentOrg.getChildren()); return r; } + + @Override + public List partymemberListByPartyOrgId(String partyOrgId) { + IcPartyOrgEntity partyOrg = icPartyOrgDao.selectById(partyOrgId); + LambdaQueryWrapper query = null; + if (partyOrg == null) { + String baseErrorMsg = "【灵山大屏】党组织下的党员列表-未找到党组织信息。"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format(baseErrorMsg + "partyOrgId:" + partyOrg), baseErrorMsg); + } else if (Integer.valueOf(partyOrg.getPartyOrgType()) >= 4) { + // 0省委,1市委,2区委,3党工委,4党委,5支部。党委以上，除了支部 + query = new LambdaQueryWrapper<>(); + query.eq(IcPartyMemberEntity::getOrgPids, PidUtils.convertPid2OrgIdPath(partyOrgId, partyOrg.getOrgPids())); + query.eq(IcPartyMemberEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + } else { + // 5支部 + query = new LambdaQueryWrapper<>(); + query.eq(IcPartyMemberEntity::getOrgPids, partyOrg.getOrgPids()); + query.eq(IcPartyMemberEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + } + + List l = icPartyMemberDao.selectList(query); + + // 党员列表转化为需要的dto返回 + return l.stream().map(e -> { + // 查询支部 + IcPartyOrgEntity branch = icPartyOrgDao.selectById(e.getSszb()); + + LingShanScreenPartyOrgTreeResultDTO.Partymember t = new LingShanScreenPartyOrgTreeResultDTO.Partymember(); + t.setName(e.getName()); + t.setAge(e.getAgencyId()); + Integer gender = e.getGender(); + t.setGender(gender != null ? GenderEnum.getName(gender.toString()) : "未知"); + t.setOrgname(branch != null ? branch.getPartyOrgName() : null); + t.setPhone(e.getMobile()); + t.setRemarks(e.getRemark()); + t.setPhoto(e.getHeadPhoto()); + // t.setIsDby(); + // t.setIsLhdy(); + // t.setWorkStatus(); + // t.setWorknumber(); + // t.setWorkEvent(); + return t; + }).collect(Collectors.toList()); + } + + /** + * @description: 这个方法其实有更容易实现，更容易阅读和理解的方式。循环活动类型，每个活动类型都查询一次统计数据即可。 + * 但是前期追求更少次数的数据库调用以提升效率，越写越复杂，既然已经这样了也懒得改了，就这样吧。 + * 如果后面有人感觉维护不了了，直接按照上述方式重写就行了，不要犹豫，不要徘徊，很容易改，没有暗雷！！！ + * @param agencyId: 行政组织id + * @return + * @author: WangXianZhang + * @date: 2023/4/14 11:33 PM + */ + @Override + public List actQtyOfPartyOrgStats(String agencyId, Date holdTimeStart, Date holdTimeEnd) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + if (agencyInfo == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); + } + + // String orgIdpath = PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids()); + + // 先查当前党组织信息 + LambdaQueryWrapper currentPartyOrgQuery = new LambdaQueryWrapper<>(); + currentPartyOrgQuery.eq(IcPartyOrgEntity::getAgencyId, agencyId); + currentPartyOrgQuery.orderByAsc(IcPartyOrgEntity::getPartyOrgType); + currentPartyOrgQuery.last(" limit 1 "); + + IcPartyOrgEntity currentPartyOrg = icPartyOrgDao.selectOne(currentPartyOrgQuery); + + if (currentPartyOrg == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "未找到党组织信息"); + } + + // ----------------------------要重写的话，上面建议保留噢，只重写下面就可以了，淦--------------------------------- + + // 找出当前党组织的下级党组织(全部)，及其对应的活动数量 + List l = partyActDao.actQtyOfPartyOrgStats(currentPartyOrg.getId(), holdTimeStart, holdTimeEnd); + + // 将结果遍历，分成2个纬度，分别建立地址引用 + // Map> + Map> orgDimMap = new HashMap<>(); + HashMap orgIdAndName = new HashMap<>(); + + l.forEach(e -> { + orgIdAndName.put(e.getOrgId(), e.getName()); + String actType = e.getActType(); + if (StringUtils.isNotBlank(actType)) { + // 不为空，说明该类型有活动数据 + Map m = orgDimMap.get(actType); + if (m == null) { + m = new HashMap<>(); + orgDimMap.put(actType, m); + } + m.put(e.getOrgId(), e); + } + }); + + // 所有的活动类型，并且建立字典，供后续使用 + LambdaQueryWrapper actTypeQuery = new LambdaQueryWrapper<>(); + actTypeQuery.eq(IcPartyActTypeDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + List actTypes = partyActTypeDictDao.selectList(actTypeQuery); + + Map actTypeKeyAndName = actTypes.stream().collect(Collectors.toMap(IcPartyActTypeDictEntity::getTypeKey, IcPartyActTypeDictEntity::getTypeName)); + + // 二维遍历，外层活动类型，内层组织id。确保两个维度的坐标都是全的（哪怕value=0） + for (IcPartyActTypeDictEntity actType : actTypes) { + // 补全外层活动类型 + Map orgIdAndStats = orgDimMap.get(actType.getTypeKey()); + if (orgIdAndStats == null) { + orgIdAndStats = new HashMap<>(); + orgDimMap.put(actType.getTypeKey(), orgIdAndStats); + } + + // 为活动类型补全组织列表（没有活动的组织赋值0） + for (Map.Entry entry : orgIdAndName.entrySet()) { + String orgId = entry.getKey(); + LingShanScreenPartyActQtyStatsResultDTO.StatsData statsData = orgIdAndStats.get(orgId); + if (statsData == null) { + LingShanScreenPartyActQtyStatsResultDTO.StatsData e = new LingShanScreenPartyActQtyStatsResultDTO.StatsData(); + e.setOrgId(orgId); + e.setName(entry.getValue()); + e.setValue(0); + e.setActType(actType.getTypeKey()); + orgIdAndStats.put(orgId, e); + } + } + } + + // 将结果map转化为list，返回 + ArrayList rl = new ArrayList<>(); + + orgDimMap.forEach((actType, orgStatsMap) -> { + LingShanScreenPartyActQtyStatsResultDTO re = new LingShanScreenPartyActQtyStatsResultDTO(); + re.setType(actTypeKeyAndName.get(actType)); + re.setData(orgStatsMap.values()); + rl.add(re); + }); + + return rl; + } } 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 6520ed005f..0fe90e0949 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 @@ -99,6 +99,7 @@ SELECT a.ID AS icPartyActId, a.TOPIC, + a.ORG_ID as orgId, a.PUBLISH_PARTY_ORG_NAME AS publishPartyOrgName, a.PUBLISH_STAFF_NAME AS publishStaffName, d.TYPE_NAME AS actTypeName, @@ -282,4 +283,16 @@ group by t.TYPE_KEY + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml index a9d4f8c583..b33c53a9d0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml @@ -35,8 +35,9 @@ + - SELECT * FROM (