diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IDCardUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IDCardUtil.java new file mode 100644 index 0000000000..3ec57c53f5 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IDCardUtil.java @@ -0,0 +1,132 @@ +package com.epmet.commons.tools.utils; + +import com.epmet.commons.tools.enums.GenderEnum; +import org.apache.commons.lang3.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/13 17:53 + */ +public class IDCardUtil { + /** + * 15位身份证号 + */ + private static final Integer FIFTEEN_ID_CARD=15; + /** + * 18位身份证号 + */ + private static final Integer EIGHTEEN_ID_CARD=18; + private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + + /** + * 根据身份证号获取性别 + * @param idCard + * @return + */ + public static String getSex(String idCard){ + String sex =""; + if (StringUtils.isNotBlank(idCard)){ + //15位身份证号 + if (idCard.length() == FIFTEEN_ID_CARD){ + if (Integer.parseInt(idCard.substring(14, 15)) % 2 == 0) { + sex = GenderEnum.WOMAN.getCode(); + } else { + sex = GenderEnum.MAN.getCode(); + } + //18位身份证号 + }else if(idCard.length() == EIGHTEEN_ID_CARD){ + // 判断性别 + if (Integer.parseInt(idCard.substring(16).substring(0, 1)) % 2 == 0) { + sex = GenderEnum.WOMAN.getCode(); + } else { + sex = GenderEnum.MAN.getCode(); + } + } + } + return sex; + } + + /** + * 根据身份证号获取年龄 + * @param idCard + * @return + */ + public static Integer getAge(String idCard){ + int age = 0; + Date date = new Date(); + if (StringUtils.isNotBlank(idCard)){ + //15位身份证号 + if (idCard.length() == FIFTEEN_ID_CARD){ + // 身份证上的年份(15位身份证为1980年前的) + String uyear = "19" + idCard.substring(6, 8); + // 身份证上的月份 + String uyue = idCard.substring(8, 10); + // 当前年份 + String fyear = format.format(date).substring(0, 4); + // 当前月份 + String fyue = format.format(date).substring(5, 7); + if (Integer.parseInt(uyue) <= Integer.parseInt(fyue)) { + age = Integer.parseInt(fyear) - Integer.parseInt(uyear) + 1; + // 当前用户还没过生 + } else { + age = Integer.parseInt(fyear) - Integer.parseInt(uyear); + } + //18位身份证号 + }else if(idCard.length() == EIGHTEEN_ID_CARD){ + // 身份证上的年份 + String year = idCard.substring(6).substring(0, 4); + // 身份证上的月份 + String yue = idCard.substring(10).substring(0, 2); + // 当前年份 + String fyear = format.format(date).substring(0, 4); + // 当前月份 + String fyue = format.format(date).substring(5, 7); + // 当前月份大于用户出身的月份表示已过生日 + if (Integer.parseInt(yue) <= Integer.parseInt(fyue)) { + age = Integer.parseInt(fyear) - Integer.parseInt(year) + 1; + // 当前用户还没过生日 + } else { + age = Integer.parseInt(fyear) - Integer.parseInt(year); + } + } + } + return age; + } + + /** + * 获取出生日期 yyyy年MM月dd日 + * @param idCard + * @return + */ + public static String getBirthday(String idCard){ + String birthday=""; + String year=""; + String month=""; + String day=""; + if (StringUtils.isNotBlank(idCard)){ + //15位身份证号 + if (idCard.length() == FIFTEEN_ID_CARD){ + // 身份证上的年份(15位身份证为1980年前的) + year = "19" + idCard.substring(6, 8); + //身份证上的月份 + month = idCard.substring(8, 10); + //身份证上的日期 + day= idCard.substring(10, 12); + //18位身份证号 + }else if(idCard.length() == EIGHTEEN_ID_CARD){ + // 身份证上的年份 + year = idCard.substring(6).substring(0, 4); + // 身份证上的月份 + month = idCard.substring(10).substring(0, 2); + //身份证上的日期 + day=idCard.substring(12).substring(0,2); + } + birthday=year+"-"+month+"-"+day; + } + return birthday; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/GetParentOrgFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/GetParentOrgFormDTO.java new file mode 100644 index 0000000000..fa1534fc65 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/GetParentOrgFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-10 16:02 + **/ +@Data +public class GetParentOrgFormDTO implements Serializable { + /** + * 党组织类型 + */ + @NotNull(message = "党组织类型不可为空") + private String partyOrgType; + + /** + * 行政组织 机关ID + */ + @NotNull(message = "行政组织id不可为空") + private String agencyId; + + /** + * 客户Id (customer.id) + */ + private String customerId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java index 90879a74f4..2fb53983a9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java @@ -16,10 +16,6 @@ public class IcPartyMemberPointDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 唯一标识 - */ - private String id; /** * 客户Id (customer.id) @@ -116,4 +112,4 @@ public class IcPartyMemberPointDTO implements Serializable { */ private Date updatedTime; -} \ 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/form/IcPartyMemberFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java index 42da9bdf94..5ded6b154c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java @@ -81,4 +81,5 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable { */ private String payEndDate; private String year; + private String month; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberPointListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberPointListFormDTO.java index 5055126aec..4ca728461e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberPointListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberPointListFormDTO.java @@ -10,10 +10,14 @@ import java.io.Serializable; @Data @AllArgsConstructor @NoArgsConstructor -public class PartyMemberPointListFormDTO extends PageFormDTO implements Serializable { +public class PartyMemberPointListFormDTO implements Serializable { private static final long serialVersionUID = 5659445492756209830L; + private Integer page; + + private Integer limit; + /** * 所属党组织id */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index de18151595..0098acd036 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -52,18 +52,18 @@ public interface ResiPartyMemberOpenFeignClient { Result addPartyMemberBaseInfo(@RequestBody PartyMemberBaseInfoAddFormDTO formDTO); /** - * @return com.epmet.commons.tools.utils.Result> * @param partyBranchId + * @return com.epmet.commons.tools.utils.Result> * @author yinzuomei - * @description 根据党支部id,查询党员列表 + * @description 根据党支部id, 查询党员列表 * @Date 2020/6/18 10:12 **/ @GetMapping(value = "/resi/partymember/partymemberbaseinfo/listPartyMemberBaseInfo/{partyBranchId}") Result> listPartyMemberBaseInfo(@PathVariable("partyBranchId") String partyBranchId); /** - * @return com.epmet.commons.tools.utils.Result * @param partyMemberId 党员库id主键 + * @return com.epmet.commons.tools.utils.Result * @author yinzuomei * @description 根据党员id查询党员信息 * @Date 2020/6/18 15:30 @@ -72,8 +72,8 @@ public interface ResiPartyMemberOpenFeignClient { Result queryPartyMemberBaseInfoById(@PathVariable("partyMemberId") String partyMemberId); /** - * @return com.epmet.commons.tools.utils.Result * @param formDTO + * @return com.epmet.commons.tools.utils.Result * @author yinzuomei * @description 删除党员 * @Date 2020/6/18 17:57 @@ -82,8 +82,8 @@ public interface ResiPartyMemberOpenFeignClient { Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO); /** - * @return com.epmet.commons.tools.utils.Result> * @param userIdList + * @return com.epmet.commons.tools.utils.Result> * @author yinzuomei * @description 根据用户id查询认证通过的党员信息 * @Date 2020/7/22 12:14 @@ -92,8 +92,8 @@ public interface ResiPartyMemberOpenFeignClient { Result> queryPartymemberInfoByUserId(@RequestBody List userIdList); /** - * @return com.epmet.commons.tools.utils.Result> * @param gridIdList + * @return com.epmet.commons.tools.utils.Result> * @author zy * @description 根据网格id查询认证通过的党员信息 * @Date 2020/7/22 12:14 @@ -102,22 +102,23 @@ public interface ResiPartyMemberOpenFeignClient { Result> getPartymemberInfoByGridId(@RequestBody List gridIdList); /** - * @Description 根据客户ID查询党员 + * @Description 根据客户ID查询党员 * @Param customerId * @author zxc * @date 2021/9/6 3:54 下午 */ @PostMapping(value = "/resi/partymember/partymemberinfo/getpartymemberinfobycustomerid") - Result> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId); + Result> getPartyMemberInfoByCustomerId(@RequestParam("customerId") String customerId); /** * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在 + * * @param gridId * @author zxc * @date 2022/3/15 4:19 下午 */ @PostMapping("/resi/partymember/partymemberconfirmmanual/audit-reset") - Result partyMemberAuditReset(@RequestParam("gridId")String gridId); + Result partyMemberAuditReset(@RequestParam("gridId") String gridId); /** * @Description 同步党员信息 @@ -129,6 +130,9 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyMember/icPartyMemberSync") Result icPartyMemberSync(@RequestBody IcPartyMemberDTO dto); + @PostMapping("/resi/partymember/icPartyMember/getPartyMemberByIdCard") + Result getPartyMemberByIdCard(@RequestBody IcPartyMemberDTO dto); + @PostMapping("/resi/partymember/icPartyOrg/branchlist") public Result> branchlist(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 69215d5380..57ce87c1e4 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -92,6 +92,11 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "icPartyMemberSync", dto); } + @Override + public Result getPartyMemberByIdCard(IcPartyMemberDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberByIdCard", dto); + } + @Override public Result> branchlist() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "branchlist", null); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index c0b0af1144..499c2a1d70 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; @@ -96,6 +97,19 @@ public class IcPartyOrgController { return icPartyOrgService.getTreelist(formDTO); } + /** + * @describe: 列表搜索党组织树(不包含当前级组织) + * @author wangtong + * @date 2022/6/10 14:20 + * @params [tokenDto, formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + @GetMapping("getSearchTreelist") + public Result> getSearchTreelist(@LoginUser TokenDto tokenDto,PartyOrgTreeListDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + return icPartyOrgService.getSearchTreelist(formDTO); + } + /** * @describe: 当前登录用户所属行政组织，及下级的党组织（只限支部） * @author wangtong @@ -108,6 +122,19 @@ public class IcPartyOrgController { return icPartyOrgService.branchlist(tokenDto); } - + /** + * @describe: 上级党组织列表 + * @author wangtong + * @date 2022/6/10 15:59 + * @params [tokenDto, formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + @GetMapping("getParentOrgList") + public Result> getParentOrgList(@LoginUser TokenDto tokenDto, GetParentOrgFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return icPartyOrgService.getParentOrgList(formDTO); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 3413e87649..93fa4d8a64 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -3,7 +3,6 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.ibatis.annotations.Mapper; @@ -21,7 +20,7 @@ import java.util.List; public interface IcPartyOrgDao extends BaseDao { /** - * @describe: 获取组织列表 + * @describe: 获取当前及下级组织列表 * @author wangtong * @date 2022/5/17 19:00 * @params [] @@ -75,4 +74,34 @@ public interface IcPartyOrgDao extends BaseDao { * @return java.util.List */ List selectAllBranchByAgencyId(@Param("agencyId") String agencyId, @Param("customerId") String customerId); + + /** + * @describe: 获取下级组织列表 + * @author wangtong + * @date 2022/6/10 14:21 + * @params [formDTO] + * @return java.util.List + */ + List getSearchTreelist(PartyOrgTreeListDTO formDTO); + + /** + * @describe: 获取上级党组织 + * @author wangtong + * @date 2022/6/10 16:48 + * @params [agencyPid, customerId, code] + * @return java.util.List + */ + List selectParentOrgByAgencyPid(@Param("agencyId") String agencyId, + @Param("agencyPid") String agencyPid, + @Param("customerId") String customerId, + @Param("partyOrgType") String partyOrgType); + + /** + * @describe: 查询该客户下的一级组织 + * @author wangtong + * @date 2022/6/10 17:29 + * @params [customerId] + * @return com.epmet.modules.partyOrg.entity.IcPartyOrgEntity + */ + IcPartyOrgEntity selectByCustomerIdAndFirstOrg(@Param("customerId") String customerId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index 5405a5b531..6397916cc6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; @@ -98,4 +99,22 @@ public interface IcPartyOrgService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result> branchlist(TokenDto tokenDto); + + /** + * @describe: 列表搜索党组织树(不包含当前级组织) + * @author wangtong + * @date 2022/6/10 14:20 + * @params [formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + Result> getSearchTreelist(PartyOrgTreeListDTO formDTO); + + /** + * @describe: 上级党组织列表 + * @author wangtong + * @date 2022/6/10 16:01 + * @params [formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + Result> getParentOrgList(GetParentOrgFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 789d94bbca..70cb443864 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; 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.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -14,13 +15,16 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.enums.OrgLevelEnums; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; @@ -48,6 +52,9 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl page(Map params) { @@ -65,8 +72,8 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -84,47 +91,47 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl orgList = baseDao.selectAllByOrgId(id); - if(!CollectionUtils.isEmpty(orgList)){ + if (!CollectionUtils.isEmpty(orgList)) { throw new EpmetException("请先删除下级党组织！"); } //判断该组织下是否有党员 List memberList = icPartyMemberDao.selectAllByOrgId(id); - if(!CollectionUtils.isEmpty(memberList)){ + if (!CollectionUtils.isEmpty(memberList)) { throw new EpmetException("该组织下有党员信息暂时不可删除！"); } baseDao.deleteById(id); @@ -215,15 +222,15 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl> branchlist(TokenDto tokenDto) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); List resultList = new ArrayList<>(); BranchlistTreeDTO result = new BranchlistTreeDTO(); result.setValue(staffInfo.getAgencyId()); // result.setOrgPids(staffInfo.getAgencyPIds()); result.setLabel(staffInfo.getAgencyName()); //该行政组织下的所有类型为支部的党组织 - List orgList = baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId()); - if(CollectionUtils.isEmpty(orgList)){ + List orgList = baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(), tokenDto.getCustomerId()); + if (CollectionUtils.isEmpty(orgList)) { return new Result>().ok(resultList); } result.setChildren(orgList); @@ -231,6 +238,38 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>().ok(resultList); } + @Override + public Result> getSearchTreelist(PartyOrgTreeListDTO formDTO) { + List list = baseDao.getSearchTreelist(formDTO); + return new Result>().ok(build(list)); + } + + @Override + public Result> getParentOrgList(GetParentOrgFormDTO formDTO) { + Result agencyDTOResult = govOrgOpenFeignClient.getAgencyById(formDTO.getAgencyId()); + if (!agencyDTOResult.success() || null == agencyDTOResult || null == agencyDTOResult.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询行政组织信息错误", "查询行政组织信息错误"); + } + String agencyPid = agencyDTOResult.getData().getPid(); + List list = new ArrayList<>(); + //如果本工作人员的级别是该客户下的最高级别，并且没有一级组织时，添加一级组织选项 + IcPartyOrgEntity entity = baseDao.selectByCustomerIdAndFirstOrg(formDTO.getCustomerId()); + if("0".equals(agencyPid) && null == entity){ + IcPartyOrgTreeDTO firstOrg = new IcPartyOrgTreeDTO(); + firstOrg.setId("0"); + firstOrg.setPartyOrgName("一级组织"); + list.add(firstOrg); + } + //如果类型为支部，则查询该行政组织下的所有党委(列表) + if(PartyOrgTypeEnum.BRANCH.getCode().equals(formDTO.getPartyOrgType())){ + list.addAll(baseDao.selectParentOrgByAgencyPid(formDTO.getAgencyId(),null,formDTO.getCustomerId(),PartyOrgTypeEnum.PARTY.getCode())); + }else{ + //查询该行政组织对应上级所关联的党组织(单个实体类) + list.addAll(baseDao.selectParentOrgByAgencyPid(null,agencyPid,formDTO.getCustomerId(),null)); + } + return new Result>().ok(list); + } + /** * 构建树节点 */ @@ -239,13 +278,13 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl nodeMap = new LinkedHashMap<>(treeNodes.size()); - for(IcPartyOrgTreeDTO treeNode : treeNodes){ + for (IcPartyOrgTreeDTO treeNode : treeNodes) { nodeMap.put(treeNode.getId(), treeNode); } - for(IcPartyOrgTreeDTO node : nodeMap.values()) { + for (IcPartyOrgTreeDTO node : nodeMap.values()) { IcPartyOrgTreeDTO parent = nodeMap.get(node.getPid()); - if(parent != null && !(node.getId().equals(parent.getId()))){ + if (parent != null && !(node.getId().equals(parent.getId()))) { parent.getChildren().add(node); continue; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 3390d45acc..a1fdca4c49 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -112,6 +112,12 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result(); } + @PostMapping("getPartyMemberByIdCard") + public Result getPartyMemberByIdCard(@RequestBody IcPartyMemberDTO dto){ + IcPartyMemberDTO result = icPartyMemberService.getPartyMemberByIdCard(dto); + return new Result().ok(result); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFromDTO formDTO, HttpServletResponse response) throws Exception { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPayRecordDetailController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPayRecordDetailController.java index 4c095ac243..68b1b5248b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPayRecordDetailController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPayRecordDetailController.java @@ -52,6 +52,7 @@ public class IcPartyMemberPayRecordDetailController { @RequestMapping("page") public Result> page(@LoginUser TokenDto tokenDto, @RequestParam Map params){ params.put("customerId",tokenDto.getCustomerId()); + params.put("userId",tokenDto.getUserId()); // PageData page = icPartyMemberPayRecordDetailService.page(params); PageData page = icPartyMemberPayRecordDetailService.getPhrasePage(params); return new Result>().ok(page); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java index 5d32013fbb..7d111cfa92 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java @@ -105,8 +105,8 @@ public class IcPartyMemberPointController { @PostMapping("export") public void export(@RequestBody PartyMemberPointListFormDTO formDto, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { - formDto.setIsPage(false); - formDto.setPageSize(NumConstant.TEN_THOUSAND); + + formDto.setLimit(NumConstant.TEN_THOUSAND); ExcelWriter excelWriter = null; AtomicInteger i = new AtomicInteger(1); @@ -123,8 +123,8 @@ public class IcPartyMemberPointController { item.setIndex(i.getAndIncrement()); }); excelWriter.write(list, writeSheet); - formDto.setPageNo(formDto.getPageNo() + NumConstant.ONE); - } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDto.getPageSize()); + formDto.setPage(formDto.getPage() + NumConstant.ONE); + } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDto.getLimit()); } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java index 9e44e7d2b6..ed745c2b90 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java @@ -47,4 +47,6 @@ public interface IcPartyMemberPointDao extends BaseDao @Param("quarter") String quarter, @Param("customerId") String customerId, @Param("partyMemberId") String partyMemberId); -} \ No newline at end of file + + void updateByPartyMemberId(@Param("entity") IcPartyMemberPointEntity entity); +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index 0d84d90723..20373c3ca5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -85,6 +85,16 @@ public interface IcPartyMemberService extends BaseService { */ void delete(String[] ids); + /** + * 根据身份证获取党员信息 + * + * @Param dto + * @Return {@link IcPartyMemberDTO} + * @Author zhaoqifeng + * @Date 2022/6/9 10:07 + */ + IcPartyMemberDTO getPartyMemberByIdCard(IcPartyMemberDTO dto); + /** * 党员信息同步 * diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPayRecordDetailServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPayRecordDetailServiceImpl.java index fb1d15b57e..ba21b74d5c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPayRecordDetailServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPayRecordDetailServiceImpl.java @@ -4,30 +4,29 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerOrgRedis; -import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; +import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partymember.dao.IcPartyMemberPayRecordDetailDao; import com.epmet.modules.partymember.entity.IcPartyMemberPayRecordDetailEntity; -import com.epmet.modules.partymember.entity.IcPartymemberStyleCategoryDictEntity; -import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity; import com.epmet.modules.partymember.redis.IcPartyMemberPayRecordDetailRedis; import com.epmet.modules.partymember.service.IcPartyMemberPayRecordDetailService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPayRecordDetailDTO; -import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; -import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberPayRecordDetailFormDTO; -import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -42,6 +41,8 @@ public class IcPartyMemberPayRecordDetailServiceImpl extends BaseServiceImpl page(Map params) { @@ -59,6 +60,25 @@ public class IcPartyMemberPayRecordDetailServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + String customerId = (String) params.get("customerId"); + String userId = (String) params.get("userId"); + String orgId = (String) params.get("orgId"); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取工作人员信息失败", "获取工作人员信息失败"); + } + if (StringUtils.isBlank(orgId)) { + //获取工作人员所属组织同级的党组织 + LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyOrgEntity::getCustomerId, customerId); + orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); + orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + IcPartyOrgEntity org = icPartyOrgDao.selectOne(orgWrapper); + if (null == org) { + return new PageData<>(Collections.emptyList(), 0); + } + params.put("orgId",org.getId()); + } IPage page = getPage(params); List list = baseDao.selectListInfo(params); return new PageData<>(list, page.getTotal()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index 3ccab433ff..e52fe10436 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -14,13 +14,9 @@ import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity; import com.epmet.modules.partymember.redis.IcPartyMemberPointRedis; import com.epmet.modules.partymember.service.IcPartyMemberPointService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO; -import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO; -import com.epmet.resi.partymember.dto.partymember.form.PartyMemberExportFormDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO; -import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointExportResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -29,10 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.sql.Time; import java.time.Year; import java.util.Arrays; -import java.util.Calendar; import java.util.List; import java.util.Map; @@ -135,7 +129,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl getList(PartyMemberPointListFormDTO form, TokenDto tokenDto) { - PageHelper.startPage(form.getPageNo(), form.getPageSize(), form.getIsPage()); + PageHelper.startPage(form.getPage(), form.getLimit()); List dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(), form.getOrgId(), form.getYear(), tokenDto.getCustomerId()); PageInfo pageInfo = new PageInfo<>(dto); @@ -191,7 +185,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl getExport(PartyMemberPointListFormDTO form, TokenDto tokenDto) { - PageHelper.startPage(form.getPageNo(), form.getPageSize(), form.getIsPage()); + PageHelper.startPage(form.getPage(), form.getLimit()); List dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(), form.getOrgId(), form.getYear(), tokenDto.getCustomerId()); PageInfo pageInfo = new PageInfo<>(dto); @@ -199,4 +193,4 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl list = baseDao.selectList(formDTO); @@ -331,6 +333,24 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId()); + wrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard()); + IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(partyMember, IcPartyMemberDTO.class); + } + /** * 党员信息同步 * @@ -361,6 +381,21 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl= 70) { + entity.setIsMxx(NumConstant.ONE_STR); + } else { + entity.setIsMxx(NumConstant.ZERO_STR); + } + if (StringUtils.isBlank(entity.getIsLd())) { + entity.setIsLd(NumConstant.ZERO_STR); + } + if (StringUtils.isBlank(entity.getIsDyzxh())) { + entity.setIsDyzxh(NumConstant.ZERO_STR); + } + if (StringUtils.isBlank(entity.getIsTx())) { + entity.setIsTx(NumConstant.ZERO_STR); + } //判断党员是否已存在,有则更新，没有则添加 if (null != partyMember) { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 34f4cc1a79..1af1738da2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -96,6 +96,55 @@ AND (AGENCY_ID = #{agencyId} or AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' )) + + + 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 d71cdbd883..21ea480cca 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 @@ -51,7 +51,7 @@ a.LDZH, a.PARTY_ZW, a.ADDRESS, - IF( b.PAY_DATE IS NULL, 0, 1 ) AS isPay, + IF( e.MONEY IS NULL, 0, 1 ) AS isPay, b.PAY_DATE, a.CULTURE, a.TOTAL_SCORE AS point, @@ -73,6 +73,8 @@ AND b.CUSTOMER_ID = #{customerId} INNER JOIN ic_party_org d ON a.SSZB = d.ID AND d.DEL_FLAG = 0 + LEFT JOIN ic_party_member_pay_record_detail e ON a.ID = e.PARTY_MEMBER_ID + AND e.DEL_FLAG = 0 AND e.`YEAR` = #{year} AND e.`MONTH` = #{month} WHERE a.DEL_FLAG = 0 AND a.CUSTOMER_ID = #{customerId} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPayRecordDetailDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPayRecordDetailDao.xml index aaf0abe2c1..f4898cea8a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPayRecordDetailDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPayRecordDetailDao.xml @@ -33,6 +33,7 @@ left join ic_party_org org on org.ID = pm.SSZB and org.DEL_FLAG = 0 where prd.DEL_FLAG = 0 and prd.CUSTOMER_ID = #{customerId} + AND (pm.SSZB = #{orgId} OR pm.ORG_PIDS LIKE concat('%', #{orgId}, '%')) and pm.NAME like concat('%',#{name},'%') @@ -42,9 +43,6 @@ and pm.ID_CARD like concat('%',#{idCard},'%') - - and FIND_IN_SET(#{orgId},pm.ORG_PIDS) - and prd.YEAR = #{year} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml index 60fa191f70..c2b6857a10 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml @@ -8,6 +8,23 @@ WHERE id = #{partyMemberId} + + UPDATE ic_party_member_point + SET BASE_POINT = #{entity.basePoint}, + BASE_OPTIONS = #{entity.baseOptions}, + REVIEW_POINT = #{entity.reviewPoint}, + REVIEW_OPTIONS = #{entity.reviewOptions}, + INSPIRE_POINT = #{entity.inspirePoint}, + INSPIRE_OPTIONS = #{entity.inspireOptions}, + WARN_POINT = #{entity.warnPoint}, + WARN_OPTIONS = #{entity.warnOptions} + WHERE + DEL_FLAG = '0' + AND PARTY_MEMBER_ID = #{entity.partyMemberId} + AND YEAR = #{entity.year} + AND QUARTER = #{entity.quarter} + AND CUSTOMER_ID = #{entity.customerId} + - \ No newline at end of file + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java index cfcd9da6aa..97cc70ea11 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java @@ -3,6 +3,8 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * @Description @@ -16,4 +18,10 @@ public class IcUserRoleResultDTO implements Serializable { * 是否是志愿者0否，1是 */ private String isVolunteer; + /** + * 是否是党员0否，1是 + */ + private String isPartyMember; + + private Map>> detail; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 66036a259a..07ce4b8c6e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -269,6 +269,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { + if (!hash.containsKey("SSZB")) { + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + } + } else { + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + partyMemberDTO.setCustomerId(tokenDto.getCustomerId()); partyMemberDTO.setAgencyId(agencyId); partyMemberDTO.setAgencyPids(result.getData().getPids()); @@ -291,6 +303,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { + if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + } + } else { + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + } if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY"))) || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) { partyMemberDTO.setCustomerId(tokenDto.getCustomerId()); @@ -2460,7 +2486,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl>> detail = new HashMap<>(); result.setIsVolunteer(NumConstant.ZERO_STR); + result.setIsPartyMember(NumConstant.ZERO_STR); //根据身份证获取小程序端居民信息 LambdaQueryWrapper baseInfoWrapper = new LambdaQueryWrapper<>(); baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, formDTO.getCustomerId()); @@ -2480,7 +2508,26 @@ public class IcResiUserServiceImpl extends BaseServiceImpl memberInfoResult = resiPartyMemberOpenFeignClient.getPartyMemberByIdCard(memberFormDTO); + if (memberInfoResult.success() && null != memberInfoResult.getData()) { + List> list = new ArrayList<>(); + Map memberMap = new HashMap<>(); + result.setIsPartyMember(NumConstant.ONE_STR); + com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO dto = memberInfoResult.getData(); + memberMap.put("RDSJ", dto.getRdsj()); + memberMap.put("SSZB", dto.getSszb()); + memberMap.put("IS_LD", dto.getIsLd()); + memberMap.put("LDZH", dto.getLdzh()); + memberMap.put("PARTY_ZW", dto.getPartyZw()); + memberMap.put("IS_DYZXH", dto.getIsDyzxh()); + list.add(memberMap); + detail.put("ic_party_member", list); + } + result.setDetail(detail); return result; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml index e8bec0b3b8..acfca0cf16 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml @@ -97,7 +97,7 @@ p.CUSTOMER_ID = #{customerId} and c.VOLUNTEER_CATEGORY is not null AND c.VOLUNTEER_CATEGORY != '' - AND p.AGENCY_ID = #{agencyId} + AND ( p.AGENCY_ID = #{agencyId} or p.AGENCY_PIDS like '%${agencyId}%' ) AND p.del_flag = '0' GROUP BY c.VOLUNTEER_CATEGORY @@ -108,4 +108,4 @@ delete from ic_volunteer_poly_category where CUSTOMER_ID = #{customerId} - \ No newline at end of file +