Merge remote-tracking branch 'origin/dev_partymember_sync' into dev_partymember_sync

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java

@@ -15,7 +15,6 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * desc:脱敏处理器
@@ -209,7 +208,9 @@ public class MaskProcessor {
         }
 
         String maskStr = StrUtil.repeatByLength("*", length - 7);
-
+        if (length != 11) {
+            return StringUtils.leftPad(StringUtils.right(originString, 4), length, "*");
+        }
         return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString());
     }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java

@@ -398,6 +398,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         if (StringUtils.isBlank(entity.getIsTx())) {
             entity.setIsTx(NumConstant.ZERO_STR);
         }
+        if (StringUtils.isBlank(entity.getIsQcj())) {
+            entity.setIsQcj(NumConstant.ZERO_STR);
+        }
 
         //判断党员是否已存在,有则更新，没有则添加
         if (null != partyMember) {
@@ -673,6 +676,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         e.setIsLd(("是").equals(e.getIsLd())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
         e.setIsDyzxh(("是").equals(e.getIsDyzxh())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
         e.setIsMxx(("是").equals(e.getIsMxx())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
+        e.setIsQcj(("是").equals(e.getIsQcj())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
         //职务
         e.setPartyZw(PartyPostEnum.getCode(e.getPartyZw()));
         //文化程度

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java

@@ -85,6 +85,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity {
      */
 	private String isDyzxh;
 
+	/**
+	 * 入党时所在党支部
+	 */
+	private String rdsszzb;
+
+	/**
+	 * 组织关系转入社区时间
+	 */
+	private String zzgxzrsqsj;
+
+	/**
+	 * 是否请长假
+	 */
+	private String isQcj;
+
     /**
      * 预留字段1
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -342,6 +342,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     partyMemberDTO.setName(map.get("NAME"));
                     partyMemberDTO.setIdCard(map.get("ID_CARD"));
                     partyMemberDTO.setMobile(map.get("MOBILE"));
+                    partyMemberDTO.setCulture(map.get("CULTURE"));
 
                     String houseAddress = getHouseAddress4PartymemberInfo(tokenDto.getCustomerId(), map.get("GRID_ID"), map.get("HOME_ID"));
                     partyMemberDTO.setAddress(houseAddress);
@@ -606,6 +607,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     } else {
                         partyMemberDTO.setMobile(icResiUser.getMobile());
                     }
+                    if (map.containsKey("CULTURE")) {
+                        partyMemberDTO.setCulture(map.get("CULTURE"));
+                    } else {
+                        partyMemberDTO.setCulture(icResiUser.getCulture());
+                    }
+
                     //查询网格信息
                     String gridId = null;
                     if (map.containsKey("GRID_ID")) {
@@ -2394,6 +2401,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             user.setName(formDTO.getName());
             user.setMobile(formDTO.getMobile());
             user.setIsParty(NumConstant.ONE_STR);
+            user.setCulture(formDTO.getCulture());
             //如果是党员中心户，则居民是志愿者
             if (NumConstant.ONE_STR.equals(formDTO.getIsDyzxh())) {
                 user.setIsVolunteer(NumConstant.ONE_STR);
@@ -2438,6 +2446,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             user.setName(formDTO.getName());
             user.setMobile(formDTO.getMobile());
             user.setIsParty(NumConstant.ONE_STR);
+            user.setCulture(formDTO.getCulture());
             //如果是党员中心户，则居民是志愿者
             if (NumConstant.ONE_STR.equals(formDTO.getIsDyzxh())) {
                 user.setIsVolunteer(NumConstant.ONE_STR);
@@ -2449,13 +2458,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
 
         //判断是否有党员信息，没有则新增一条，有的话就更新
-        String branch = formDTO.getOrgPids();
-        if (StringUtils.isNotBlank(branch)) {
-            branch = branch.replace(StrConstant.COLON, StrConstant.COMMA);
-        } else {
-            branch = "";
-        }
-        formDTO.setSszb(branch.concat(formDTO.getSszb()));
+        //String branch = formDTO.getOrgPids();
+        //if (StringUtils.isNotBlank(branch)) {
+        //    branch = branch.replace(StrConstant.COLON, StrConstant.COMMA);
+        //} else {
+        //    branch = "";
+        //}
+        //formDTO.setSszb(branch.concat(formDTO.getSszb()));
         LambdaQueryWrapper<IcPartyMemberEntity> partyWrapper = new LambdaQueryWrapper<>();
         partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser());
         IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper);
@@ -2475,7 +2484,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if (null != volunteer) {
             dto.setVolunteerCategory(volunteer.getVolunteerCategory());
         }
-
+        CustomerResiUserRedis.delIcResiUserInfo(dto.getIcResiUser());
         return dto;
     }