From 9dd39760903ae3374c7652bdef08dbb693a77127 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 Aug 2022 13:53:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ic=5Fresi=5Fuser=E6=96=B0=E5=A2=9Eis=5Fxjc;?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/epmetuser/IcResiUserEntity.java | 15 ++++ .../epmet/entity/user/IcResiUserEntity.java | 5 ++ .../dto/result/IcFormDataAnalysisDTO.java | 27 +++++++ .../java/com/epmet/dao/IcFormItemDao.java | 2 + .../ResiCategoryStatsConfigServiceImpl.java | 79 ++++++++----------- .../main/resources/mapper/IcFormItemDao.xml | 19 +++++ .../java/com/epmet/dto/IcResiUserDTO.java | 15 ++++ .../com/epmet/entity/IcResiUserEntity.java | 4 + .../db/migration/V0.0.64__resi_xjc.sql | 1 + 9 files changed, 120 insertions(+), 47 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java index 657b37bb14..517b65938a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java @@ -215,6 +215,21 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String isSpecial; + /** + * 是否租户【是:1 否:0】 + */ + private String isTenant; + + /** + * 是否流动人口【是:1 否:0】 + */ + private String isFloating; + + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + /** * 文化程度【字典表】 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java index 4a2260b045..7436847fd2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java @@ -225,6 +225,11 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String isFloating; + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + /** * 文化程度【字典表】 */ diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java new file mode 100644 index 0000000000..50553ab568 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/11 13:35 + */ +@Data +public class IcFormDataAnalysisDTO implements Serializable { + private String itemId; + private String label; + /** + * 分组ID,'默认，0' + */ + private String itemGroupId; + private String tableName; + /** + * 列名 + */ + private String columnName; + private Integer sort; +} + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index df9da799b0..fbc68cac11 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -97,4 +97,6 @@ public interface IcFormItemDao extends BaseDao { */ List getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId); List getItemListByGroupIdV2(@Param("customerId") String customerId, @Param("groupId") String groupId,@Param("policyFlag")String policyFlag); + + List selectDataAnalysisItem(String customerId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java index a21534cdce..6bd45b6152 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java @@ -1,20 +1,15 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.StrConstant; -import com.epmet.constant.IcResiCategoryStatsConfigConstant; import com.epmet.dao.IcFormItemDao; -import com.epmet.dao.IcFormItemGroupDao; import com.epmet.dao.IcResiCategoryStatsConfigDao; import com.epmet.dao.IcResiCategoryWarnConfigDao; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO; import com.epmet.dto.form.IcResiCategoryStatsConfigSortFormDTO; import com.epmet.dto.form.ResiCategoryStatsConfigListFormDTO; +import com.epmet.dto.result.IcFormDataAnalysisDTO; import com.epmet.dto.result.IcResiCategoryStatsConfigResultDTO; -import com.epmet.entity.IcFormItemEntity; -import com.epmet.entity.IcFormItemGroupEntity; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import com.epmet.entity.IcResiCategoryWarnConfigEntity; import com.epmet.service.IcResiCategoryStatsConfigService; @@ -28,7 +23,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Slf4j @@ -40,8 +38,6 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf @Resource private IcFormItemDao icFormItemDao; @Resource - private IcFormItemGroupDao icFormItemGroupDao; - @Resource private IcResiCategoryStatsConfigDao icResiCategoryStatsConfigDao; @Resource private IcResiCategoryWarnConfigDao icResiCategoryWarnConfigDao; @@ -52,60 +48,39 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf @Transactional(rollbackFor = Exception.class) public List list(String customerId, ResiCategoryStatsConfigListFormDTO formDTO) { //1.获取IC_FORM_ITEM 中 用于数据分析字段的 id 和label - List icFormItemEntityList = icFormItemDao.selectList(new QueryWrapper().lambda().eq(IcFormItemEntity::getCustomerId,customerId).eq(IcFormItemEntity::getDataAnalyse, 1)); - if(CollectionUtils.isEmpty(icFormItemEntityList)){ - return new ArrayList<>(); - } - Set groupIds = icFormItemEntityList.stream().filter(item-> !"0".equals(item.getItemGroupId())).map(IcFormItemEntity::getItemGroupId).collect(Collectors.toSet()); - List icFormItemGroupEntityList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(groupIds)){ - icFormItemGroupEntityList.addAll(icFormItemGroupDao.selectList(new QueryWrapper().lambda().eq(IcFormItemGroupEntity::getCustomerId,customerId).in(IcFormItemGroupEntity::getId, groupIds))); - } - - //获取tableName和COLUMN_NAME - Map tableColumnMap = new HashMap<>(); + List dataItemList=icFormItemDao.selectDataAnalysisItem(customerId); + //key:tableName-columnName value: ic_form_item + Map tableColumnMap = new HashMap<>(); + //key:ic_form_item.id value:对应的表名 Map idTableMap = new HashMap<>(); - icFormItemEntityList.forEach(item->{ - Map map = new HashMap<>(); - item.setColumnName(item.getColumnName().concat(NumConstant.ZERO == item.getColumnNum() ? StrConstant.EPMETY_STR : item.getColumnNum().toString())); - if("0".equals(item.getItemGroupId())){ - tableColumnMap.put(IcResiCategoryStatsConfigConstant.IC_RESI_USER+"-"+item.getColumnName(),item); - idTableMap.put(item.getId(),IcResiCategoryStatsConfigConstant.IC_RESI_USER); - }else{ - List collect = icFormItemGroupEntityList.stream().filter(i -> item.getItemGroupId().equals(i.getId())).collect(Collectors.toList()); - tableColumnMap.put(CollectionUtils.isEmpty(collect)?IcResiCategoryStatsConfigConstant.IC_RESI_USER:collect.get(0).getTableName()+"-"+item.getColumnName(),item); - idTableMap.put(item.getId(),CollectionUtils.isEmpty(collect)?IcResiCategoryStatsConfigConstant.IC_RESI_USER:collect.get(0).getTableName()); - } + dataItemList.forEach(item->{ + tableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); + idTableMap.put(item.getItemId(),item.getTableName()); }); - //2.获取ic_resi_category_stats_config 和 ic_resi_category_warn_config 表中的数据 + //2.获取居民类别配置表ic_resi_category_stats_config 和 居民类别预警配置表ic_resi_category_warn_config 表中的数据 List statsConfigEntityList = icResiCategoryStatsConfigDao.selectList(new QueryWrapper().lambda().eq(IcResiCategoryStatsConfigEntity::getCustomerId,customerId)); - if (!CollectionUtils.isEmpty(statsConfigEntityList)){ - return icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); - } + List warnConfigEntityList = icResiCategoryWarnConfigDao.selectList(new QueryWrapper().lambda().eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId)); - //3.新增不存在的，删除不在tableColumnMap的 + //获取居民类别配置表 Map statsTableColumnMap = new HashMap<>(); statsConfigEntityList.forEach(item->{ statsTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); }); - Map warnTableColumnMap = new HashMap<>(); - warnConfigEntityList.forEach(item->{ - warnTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); - }); + + //3.新增不存在的，删除不在tableColumnMap的 //差集 - //新增 List newStatsList = tableColumnMap.keySet().stream().filter(item -> !statsTableColumnMap.containsKey(item)).collect(Collectors.toList()); List newStatsEntityList = new ArrayList<>(); newStatsList.forEach(item->{ - IcFormItemEntity icFormItemEntity = tableColumnMap.get(item); + IcFormDataAnalysisDTO icFormItemEntity = tableColumnMap.get(item); IcResiCategoryStatsConfigEntity entity = new IcResiCategoryStatsConfigEntity(); entity.setCustomerId(customerId); entity.setLabel(icFormItemEntity.getLabel()); - entity.setTableName(idTableMap.get(icFormItemEntity.getId())); + entity.setTableName(idTableMap.get(icFormItemEntity.getItemId())); entity.setColumnName(icFormItemEntity.getColumnName()); entity.setManagementIcon(""); entity.setDataIcon(""); @@ -115,16 +90,24 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf newStatsEntityList.add(entity); }); if(!CollectionUtils.isEmpty(newStatsEntityList)){ + //新增居民类别配置表 icResiCategoryStatsConfigService.insertBatch(newStatsEntityList); } + + //4、新增居民类别预警配置表 + Map warnTableColumnMap = new HashMap<>(); + warnConfigEntityList.forEach(item->{ + warnTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); + }); + List newWarnList = tableColumnMap.keySet().stream().filter(item -> !warnTableColumnMap.containsKey(item)).collect(Collectors.toList()); List newWarnEntityList = new ArrayList<>(); newWarnList.forEach(item->{ - IcFormItemEntity icFormItemEntity = tableColumnMap.get(item); + IcFormDataAnalysisDTO icFormItemEntity = tableColumnMap.get(item); IcResiCategoryWarnConfigEntity entity = new IcResiCategoryWarnConfigEntity(); entity.setCustomerId(customerId); entity.setLabel(icFormItemEntity.getLabel()); - entity.setTableName(idTableMap.get(icFormItemEntity.getId())); + entity.setTableName(idTableMap.get(icFormItemEntity.getItemId())); entity.setColumnName(icFormItemEntity.getColumnName()); entity.setWarn("0"); entity.setSort(icFormItemEntity.getSort()); @@ -133,6 +116,8 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf if(!CollectionUtils.isEmpty(newWarnEntityList)){ icResiCategoryWarnConfigService.insertBatch(newWarnEntityList); } + + //5、原来用于数据分析，现在不用于数据分析的，要删除类别配置表和预警表 List delStatsEntityIdList = new ArrayList<>(); List delWarnEntityIdList = new ArrayList<>(); //需要删除的 @@ -151,7 +136,7 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf icResiCategoryWarnConfigService.deleteBatchIds(delWarnEntityIdList); } - //4.返回数据 + //6.返回数据 return icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index e2689c4c62..02070f1b63 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -322,4 +322,23 @@ ORDER BY ifi.SORT + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 2cd1167802..d4d3cbe812 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -219,6 +219,21 @@ public class IcResiUserDTO implements Serializable { */ private String isSpecial; + /** + * 是否租户【是:1 否:0】 + */ + private String isTenant; + + /** + * 是否是流动人口【是:1 否:0】 + */ + private String isFloating; + + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + /** * 文化程度【字典表】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 5b70e7a653..f787399b23 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -225,6 +225,10 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String isFloating; + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; /** * 文化程度【字典表】 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql new file mode 100644 index 0000000000..9ce60670d4 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql @@ -0,0 +1 @@ +alter table ic_resi_user add COLUMN IS_XJC CHAR(1) DEFAULT'0' COMMENT '是否新阶层人士【是:1 否:0】'after IS_FLOATING; \ No newline at end of file From 6b3a0ef72bddebd28e205fcf354c78785bf0c44c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 11 Aug 2022 14:15:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=9A=E6=96=B0=E9=98=B6=E5=B1=82=E4=BA=BA=E5=A3=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/enums/IcResiUserTableEnum.java | 3 ++- .../excel/ic_resi_import_template.xls | Bin 73728 -> 74240 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java index 7ae5d5d706..c921136c00 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java @@ -35,7 +35,8 @@ public enum IcResiUserTableEnum { IC_DB("virtual_db","大病人员信息录入表", null, 2, "IS_DB", false), IC_MB("virtual_mb","慢病人员信息录入表", null, 2, "IS_MB", false), IC_TENANT("virtual_tenant","租户信息录入表", null, 2, "IS_TENANT", false), - IC_FLOATING("virtual_floating","流动人口信息录入表", null, 2, "IS_FLOATING", false); + IC_FLOATING("virtual_floating","流动人口信息录入表", null, 2, "IS_FLOATING", false), + IC_XJC("virtual_xjc","新阶层人士信息录入表", null, 2, "IS_XJC", false); private String tableName; /** diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 0cd7fc22f13ba97f87c79ce9f6b8e4d39f1299e2..a316e361b468807658bae3444a7cd918aab18181 100644 GIT binary patch delta 3572 zcmb7{e^6A{701tg`-9zOciCU;F3a*$1O*k0D5ymFsfiX4NUJ0!!e~HDM44zETPBN% zRpO75dJ|TwX{DJ?9a9a?wjpDuz;tRe8PhiDm{x5&s3eX?(=nZ7OlvCr-hFQ`tZo13 z+qrx0=X}pQ=k9&?-S@U3CWQC9XnkiIniV#Szo8T` zFaJ=PVLDg5rj(M�|R7_!7N`=Nkh2m_ESm=wH(Z`R`!=t_$#L`0wle{F?>`AJ&=p zTkto6UqDPQ>{A9m?}X1~@I>|))*6^EGHyv=EQ#MrEM#t;YAs|=zS3G4O2I(Bn7{}x zP-}T+k)LQZ^9p&$74!d$s64Yglk~HretXRSN?Y4V#z+R~OQQZn>32F+zd7npj`=ST zvXsmGs3_|40o$~MKs3_IpRlL!GTX8g1gT^CT&t~($-|G@3VF88&#&41%*^lE)?wnF zuop5L-;Zx=>>*)NMj8d2FS}9InqJxt=UHe>2O$Iu7L(uxG{B zX7Sa@TXIr`z^i5iA`53;_A9@9lqXka2Hj7J90~04hBc2}t>4n}^>t4-Z0!9G1?a~u zyrD9v++5GMRHiErKgat(C-(7EFz+4Y=V3}-<2NgVWxa2R9AjRKQp}jKh*=*RW+~q+<#F=Z*pgKQ2FRKFNC?P0W@aYBpm21z|-CD!9SC@rINg}%QrO?QD=Y3&6B3cNeM^m(B&};&1?1*W? zirCl@^H1dm^@5nlch)4@#2Gp?VLNzNYpP!K!XLO;jv=ZEU$p1qT{Z5Quf`n`>SDCm zA=rl|thgIQ-G?+@4{Jo5y6QySI!#Z574fl=RH7d{M4UMWu!2#CKUd?NF8bn5iXCDK zooK>}T+xH~F3V%bB7@7?jmCy5A}jH&S8^?)-gHdryG?vodtKycZMtHvjh-+}>HN&c zKK}AGV`Qv;5es!h2k)RsADh`DGQWAsIQ9Iz)UGl z17%6d0cA^?4w@z@7nCC@4>VoU3{bA5nV>vL`Jfq~kXpU~I8%zVK>3npgC=KY4oKW) z>Uo8`|0?m=yJW!#aP;}uH1B;|MA2e6e0+6`Z)Pg0Td6G&&lS5kw zDwf(J(0oaYv3?dvDuY%MrI1+n4+Bf3xCA6NDz)HJ&>~6YAh9v1S_MdyXNnP78bE5V z5xrq7UPevmP5m^(pQCO_sy`Gbi_pzck3CvK!Hv{OWm-W6tGN?{Rm&^5kveIKBo}C@ zBsZvBk_S{FDH&9$5w(# zT8HV{M9U;8pyiTuphrN@D;Dg2dJwG&m5a-uBLnDB8EFKq0O=Gvv;+}JTPuqS%#~`i ziJqaAGCE{Nz}IBBB^q9OmF!L}JP{tTb&4yi!w$Gf8@mm?I+?}}s+W`mnjDY=v`T8u zIC6#J&>csfI7*HqZyfnRljZ%O23asAP78n17dfvMAy;= z^u&>dRjEsfKJXZJN%TySjjI=$mH91r+*Py-=E37NB zt9?b1g?AIBzDTsAHyRV#G2~S?929*%w&4enp1#Y>a`qLXUmYeYKBoCsMV>m;ZnsQ( zov7d^M6aFH{B@Cc241z=eORmF;poH1@8|4zfbTwiNU1(8)3yvEZR6WS-yb2maZaXP z5_#2U>G&;C*9S!77i8KG&ktK|4l>;lPj&^(!H-{D$sGLl#aetXy0p(A9&C(v9Vp`O zo~~7PU((J!9y#>q8%#OzmsoAy)7KWsAKS*1_r_vA{LC)KN4LB953jFQXk7ZOAAiD> zoa>UyZ(L@|nwuIQkF?!F?(W-DbmTGL=}7GU0&f~$5e+iN2d><4wVA+bt!xvv_4zD+|!^{)@%E(^Qy=fFV{xP)6#Bvnfm|3NP zL}pcZeY=+rj=OY8HtGF2|2@AiGV>JO|ObKEm>E91ba zp_4B54V}nS-tT3le(}djTmdJV`0pZEyfK7Vd6|dZKht`Y_50a2!(RA$!aMyer0lST z|LJGXvmb?brm%Y~DZD+vLPqh@v6~Hj&%=!DtswI#X?wJEy|6E#?bBG4I5;#ro&BEu E8=?~XUH||9 delta 3466 zcmb7{du$ZP9mnUlyLY~a?|d)&&gb*_0k#1{Y+eD3@e7j>12#4!Dyf4pkWgb1W3byG zg`AO+@Ja}D5-ugeN|dUKcr;0`jZ>-`s=g3Xa1^CAqB4pD!Kqu2Q?-?wLf!A|-i>{T z{?R?n{O0rf{$_r&yR)-b()PIaXERp zx0zeKY5ZYtUf?;4k3DA*S0!!LQ^n_EfS`L%*dYUj?PEZzHz zV1BG9$nAL^+6jL#b@I_^S=^E5qFp-g*6S|RnX%JFR|CqlReXO{ZrPrVB3BAM-uSKc z!wnsq9&LHD@jC}zWI<-%EEFr%Hw-nLt4~%#tl>#MToqQ{>Ecu!Qk*aI9GH2p@?|h5 zd-=CvZlB?MszYU-_r*9C8f>X-HT6u*5n!h;8XEO$RSUB46+VDbn*PLZ!F=}` zx7UP}6T^IFO{n?u4bjg^huizR@10wa{cXfhi#GiBK5F4#40Uts{nWbK{B7iU!o<(l z1YCP9VjWwl`ssI@&edOE$5WPWW&w-u6d?wlvWnRvM42w@`26uv4yL{Nr^uvaK;owLBZ82+{hpscK9vCc0TxNjEE706NDw4;Kx5Wf zNm>XLlv*|@OHvpVl9U4y>%bT#7bI?oL3yAYhWrNR19PP~4U{KoIw)UK0ce_}LeO+c zMW6ynGeCusW`c?&%>vB;MU3>tz?o8<4Voos4rubqJOC2Un9;9L-# zd7uZRHXl?XD55XC1;A1%E(Fb$^dLw)bVkBOp!t#(gC?i81hhbEWuS$Uma^UKK}qG% z7U>ib>wXzf>`O+93eXZsm7p?7RUolL7?IT=k)9MYMri~YttPbkv3QBCLu=}91N_tV zy)EvIB+0_LQ};Oa6bc@sPF5aIs9-gBVzNeh1rJgutB~XYRZ8-LswDY9)soUdVmlHi z5mE4%bh71A^nZi#c_K;ZO(I_sr6*BF z68S-s=>wofnJ_a+3xb-Ymcweq7 zWt`Zjj6L#4eUOez{i)GADy8CkxNLA0>X!!Bp#E&|5bBmI`;^hE7`2XKv#)+diu0PD zBDQhpDk<}Zb%;;ePMA!a^3)9@;z!p Date: Thu, 11 Aug 2022 14:32:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8C=87=E6=8C=A5=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/enums/ResiCategoryEnum.java | 3 ++- .../dataaggre/service/epmetuser/impl/IcResiServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java index 6416582380..8dcd47da53 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java @@ -18,7 +18,8 @@ public enum ResiCategoryEnum { IS_CJ("IS_CJ", "残疾"), IS_DB("IS_DB", "大病"), IS_MB("IS_MB", "慢病"), - IS_SPECIAL("IS_SPECIAL", "特殊人群"); + IS_SPECIAL("IS_SPECIAL", "特殊人群"), + IS_XJC("is_xjc", "新阶层人士"); private String colName; private String label; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index 10293c2a8f..2fceaabfd6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -118,6 +118,8 @@ public class IcResiServiceImpl implements IcResiService { query.eq(IcResiUserEntity::getIsMb, true); } else if (ResiCategoryEnum.IS_SPECIAL.getColName().equals(categoryKey)) { query.eq(IcResiUserEntity::getIsSpecial, true); + } else if(ResiCategoryEnum.IS_XJC.getColName().equals(categoryKey)){ + query.eq(IcResiUserEntity::getIsXjc, true); } if (StringUtils.isNotBlank(search)) { From f2a6e4c92341f3c7ec85d3e8e224bffd4e17524c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 Aug 2022 14:47:15 +0800 Subject: [PATCH 4/4] daxie --- .../java/com/epmet/commons/tools/enums/ResiCategoryEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java index 8dcd47da53..f4343639e0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java @@ -19,7 +19,7 @@ public enum ResiCategoryEnum { IS_DB("IS_DB", "大病"), IS_MB("IS_MB", "慢病"), IS_SPECIAL("IS_SPECIAL", "特殊人群"), - IS_XJC("is_xjc", "新阶层人士"); + IS_XJC("IS_XJC", "新阶层人士"); private String colName; private String label;