springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -177,8 +177,14 @@ if(oneData.get(16) != null){ vo.setWorkCompany(oneData.get(16)); } if(oneData.get(17) != null){ vo.setOutOrLocal(oneData.get(17)); if(oneData.get(17) != null && StringUtils.isNotEmpty(oneData.get(17))){ String outOrLocal = oneData.get(17); if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.bd)){ vo.setOutOrLocal(1); }else if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.wd)){ vo.setOutOrLocal(2); } } if(oneData.get(18) != null){ vo.setCensusRegister(oneData.get(18)); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealCompanyExcelListen.java
@@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.ListUtils; import com.panzhihua.common.utlis.StringUtils; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; @@ -34,11 +35,14 @@ } private static final int BATCH_COUNT = 100; private static final int BATCH_COUNT = 5000; private List<ComMngRealCompanyExcelVO> list = new ArrayList<>(); @Override public void invoke(ComMngRealCompanyExcelVO comMngRealCompanyExcelVO, AnalysisContext analysisContext) { if(StringUtils.isEmpty(comMngRealCompanyExcelVO.getCreditCode())){ throw new ServiceException("统一社会信用代码不可为空"); } list.add(comMngRealCompanyExcelVO); // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM if(list.size() >= BATCH_COUNT){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -66,7 +66,7 @@ private String workCompany; @ExcelProperty(value = "外地or本地", index = 17) private String outOrLocal; private Integer outOrLocal; @ExcelProperty(value = "户口所在地", index = 18) private String censusRegister; @@ -82,4 +82,12 @@ */ private List<String> userTagStr = Lists.newArrayList(); /** * 外地or本地(1.本地 2.外地) */ public interface outOrLocal{ String bd = "本地"; String wd = "外地"; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
@@ -28,7 +28,7 @@ " from com_act_neighbor_circle_comment_reply as reply" + " left join sys_user su1 on su1.user_id = reply.user_id " + " left join sys_user su2 on su2.user_id = reply.parent_user_id " + " where reply.comment_id = #{commentId} order by create_at desc" + " where reply.status = 1 and reply.comment_id = #{commentId} order by create_at desc" + " </script>") List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);
@@ -86,9 +86,9 @@ @EncryptDecryptField private String phone; /** * 外地or本地 * 外地or本地（1.本地 2.外地） */ private String outOrLocal; private Integer outOrLocal; /** * 户口所在地 */ @@ -177,4 +177,12 @@ int no = 13; } /** * 外地or本地（1.本地 2.外地） */ public interface outOrLocal{ int bd = 1; int wd = 2; } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -594,8 +594,9 @@ SysUserDO sysUserDO = new SysUserDO(); sysUserDO.setName(name); sysUserDO.setIdCard(idCard); sysUserDO.setSex(loginUserInfoVO.getSex()); sysUserDO.setBirthday(loginUserInfoVO.getBirthday()); //通过身份证号判断性别以及出生日期 sysUserDO.setSex(IdCard.sex(idCard)); sysUserDO.setBirthday(IdCard.birthDay(idCard)); sysUserDO.setJob(loginUserInfoVO.getJob()); sysUserDO.setUserId(loginUserInfoVO.getUserId()); sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
