diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java new file mode 100644 index 0000000000..36f7d62ab1 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java @@ -0,0 +1,34 @@ +package com.epmet.commons.tools.utils; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public class LouDongTreeNodeUtils { + + /** + * 构建树节点 + */ + public static List build(List treeNodes) { + List result = new ArrayList<>(); + + //list转map + Map nodeMap = new LinkedHashMap<>(treeNodes.size()); + for(T treeNode : treeNodes){ + nodeMap.put(treeNode.getId(), treeNode); + } + + for(T node : nodeMap.values()) { + T parent = nodeMap.get(node.getPid()); + if(parent != null && !(node.getId().equals(parent.getId()))){ + parent.getChildren().add(node); + continue; + } + + result.add(node); + } + + return result; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java new file mode 100644 index 0000000000..e4c77467a8 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java @@ -0,0 +1,48 @@ +package com.epmet.commons.tools.utils; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class LoudongTreeNode implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + private String id; + /** + * 上级ID + */ + private String pid; + /** + * 子节点列表 + */ + private List children = new ArrayList<>(); + + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java index 4a1376a5fd..a4a2bf1028 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; /** - * 获取流动人口的数据存入ca_开头的表 + * 获取ruoyi系统数据存入表内 * * @param * @author LZN diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 1bfeb17521..ca5408d581 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -98,7 +98,7 @@ public class ImportGeneralDTO implements Serializable { private String purpose; /** - * 房屋状态 1：出租 0：自住 2：闲置 + * 房屋状态 1：出租 0：自住 2：闲置 3:未出售 */ private String rentFlagString; private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java index 0d97988fd7..95c371ad83 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java @@ -15,4 +15,8 @@ public class GetAgencyListFormDTO implements Serializable { private static final long serialVersionUID = -5846836779036328298L; private String customerId; + + + //当前登录用户id，从tokenDto中获取 + private String userId; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java index 8882060a2e..a07f4fe886 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java @@ -81,7 +81,7 @@ public class IcHouseAddFormDTO implements Serializable { private String purpose; /** - * 1：出租 0：自住 2：闲置 + * 1：出租 0：自住 2：闲置 3: 未出售 */ @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index 0e2e25a049..bfff2b0709 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -48,7 +48,7 @@ public class IcHouseListFormDTO extends PageFormDTO { */ private String ownerPhone; /** - * 房屋状态 【1：出租 0：自住 2：闲置】 + * 房屋状态 【1：出租 0：自住 2：闲置 3:未出售】 */ private String rentFlag; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java index 7a4e974162..aed43f1b0c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java @@ -50,7 +50,7 @@ public class HouseChartResultDTO implements Serializable { @JsonIgnore private Integer num; - //1：出租 0：自住 2：闲置 + //1：出租 0：自住 2：闲置 3:未出售 @JsonIgnore private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java index 27cd699bf3..32337f847d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java @@ -8,7 +8,8 @@ public enum HouseRentFlagEnums { NO(0,"否");*/ HOUSE_ZZ(0,"自住"), HOUSE_CZ(1,"出租"), - HOUSE_XZ(2,"闲置"); + HOUSE_XZ(2,"闲置"), + HOUSE_WCS(3,"未出售"); @@ -41,7 +42,7 @@ public enum HouseRentFlagEnums { public static Integer getCodeByName(String name){ if(StringUtils.isEmpty(name)){ - return 0; + return null; } for (HouseRentFlagEnums e : HouseRentFlagEnums.values()) { if (e.getName().equals(name)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 557a987c09..5325163074 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -354,6 +354,20 @@ public class CustomerAgencyController { return new Result().ok(customerAgencyService.getAgencyList(formDTO)); } + /** + * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！） + * @param tokenDTO + * @param formDTO + * @return + */ + @PostMapping("my-subagency-list") + public Result getMySubAgencyList(@LoginUser TokenDto tokenDTO,@RequestBody GetAgencyListFormDTO formDTO) { + formDTO.setCustomerId(tokenDTO.getCustomerId()); + formDTO.setUserId(tokenDTO.getUserId()); + return new Result().ok(customerAgencyService.getMySubAgencyList(formDTO)); + } + + /** * @description 通过staffId查询跟组织列表 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 892ef61681..02e483d9f2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -250,7 +250,7 @@ public interface CustomerAgencyDao extends BaseDao { */ OrgResultDTO selectAgencyDetail(@Param("orgId") String orgId, @Param("orgType") String orgType); - AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId); + AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId,@Param("staffAgencyId")String staffAgencyId); List getSubAgencyList(@Param("pid") String pid); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 5940608292..a535667426 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -83,7 +83,7 @@ public class IcHouseEntity extends BaseEpmetEntity { private String purpose; /** - * 1出租；0未出租 + * 1：出租 0：自住 2：闲置 3：未出售 */ private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index b070543014..2d9bb999e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -191,12 +191,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener */ AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO); + /** + * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！） + * @param formDTO + * @return + */ + AgencyTreeResultDTO getMySubAgencyList(GetAgencyListFormDTO formDTO); + List getStaffOrgListByStaffId(String staffId); /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index f21337742e..adaf547abf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +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; @@ -32,6 +33,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -1136,7 +1138,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl categories = new ArrayList<>(); if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) { for (IcResiCategoryStatsConfigDTO category : categoryList) { @@ -302,4 +290,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl - select ID AS agencyId, ORGANIZATION_NAME AS agencyName, @@ -630,8 +632,13 @@ customer_agency where DEL_FLAG = 0 - AND PID ='0' AND CUSTOMER_ID = #{customerId} + + AND id = #{staffAgencyId} + + + AND PID ='0' + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index 99c8195b49..f3c7bb973e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -53,45 +53,52 @@ SELECT - rental_id, - grid_id, - house_id, - house_name, - house_address, - house_use, - house_area, - id_type, - id_card, - resident_name, - telephone, - curlive_address, - rent_use, - trouble_type, - renter_id, - renter_card_number, - renter_card_type, - renter_name, - renter_phone, - longitude, - latitude, - point_status, - plat_code + ca.rental_id, + ca.grid_id, + ca.house_id, + ca.house_name, + ca.house_address, + ca.house_use, + ca.house_area, + ca.id_type, + ca.id_card, + ca.resident_name, + ca.telephone, + ca.curlive_address, + ca.rent_use, + ca.trouble_type, + ca.renter_id, + ca.renter_card_number, + ca.renter_card_type, + ca.renter_name, + ca.renter_phone, + ca.longitude, + ca.latitude, + ca.point_status, + ca.plat_code, + vs.grid_name, + vs.community_name as comName, + vs.street_name FROM - ca_rental + ca_rental as ca + left join view_grid_comm_street as vs on ca.grid_id = vs.grid_id - delete_flag = 'normal' + ca.delete_flag = 'normal' - AND resident_name like '%${residentName}%' + AND ca.resident_name like '%${residentName}%' - AND house_name like '%${houseName}%' + AND ca.house_name like '%${houseName}%' - AND renter_name like '%${renterName}%' + AND ca.renter_name like '%${renterName}%' + + + AND vs.grid_id_path like '%${gridId}%' - order by grid_id,rental_id,id_card desc + order by ca.grid_id,ca.rental_id,ca.id_card desc SELECT - resident_id, - grid_id, - resident_property, - resident_type, - id_type, - id_card, - resident_name, - sex, - birthday, - nation, - telephone, - household_prov, - household_city, - household_county, - household_town, - household_village, - household_address_detail, - curlive_prov, - curlive_city, - curlive_county, - curlive_town, - curlive_village, - curlive_address_detail, - native_address_prov, - native_address_city, - native_address_county, - former_name, - education, - occupation, - occupation_type, - service_address, - marriage_status, - party, - religious, - conversion_state, - nationality, - plat_code + ca.resident_id, + ca.grid_id, + ca.resident_property, + ca.resident_type, + ca.id_type, + ca.id_card, + ca.resident_name, + ca.sex, + ca.birthday, + ca.nation, + ca.telephone, + ca.household_prov, + ca.household_city, + ca.household_county, + ca.household_town, + ca.household_village, + ca.household_address_detail, + ca.curlive_prov, + ca.curlive_city, + ca.curlive_county, + ca.curlive_town, + ca.curlive_village, + ca.curlive_address_detail, + ca.native_address_prov, + ca.native_address_city, + ca.native_address_county, + ca.former_name, + ca.education, + ca.occupation, + ca.occupation_type, + ca.service_address, + ca.marriage_status, + ca.party, + ca.religious, + ca.conversion_state, + ca.nationality, + ca.plat_code, + vs.grid_name, + vs.community_name as comName, + vs.street_name FROM - ca_resident + ca_resident as ca + left join view_grid_comm_street as vs on ca.grid_id = vs.grid_id - delete_flag = 'normal' + ca.delete_flag = 'normal' - AND resident_name like '%${residentName}%' + AND ca.resident_name like '%${residentName}%' - AND id_card like '%${idCard}%' + AND ca.id_card like '%${idCard}%' - AND telephone like '%${telephone}%' + AND ca.telephone like '%${telephone}%' + + + AND vs.grid_id_path like '%${gridId}%' - order by grid_id,resident_id,id_card desc + order by ca.grid_id,ca.resident_id,ca.id_card desc SELECT - rotators_id, - id_card, - id_type, - rotators_name, - former_name, - sex, - birthday, - nation, - native_address_prov, - native_address_city, - native_address_country, - marriage_status, - party, - education, - religious, - occupation_type, - occupation, - service_address, - telephone, - household_address_prov, - household_address_city, - household_address_country, - household_address_town, - household_address_village, - household_address_detail, - curlive_address_prov, - curlive_address_city, - curlive_address_country, - curlive_address_town, - curlive_address_village, - curlive_address_detail, - inflow_reason, - certificate_type, - certificate_number, - sign_date, - end_date, - residence_type, - is_focus_person + ca.rotators_id, + ca.id_card, + ca.id_type, + ca.rotators_name, + ca.former_name, + ca.sex, + ca.birthday, + ca.nation, + ca.native_address_prov, + ca.native_address_city, + ca.native_address_country, + ca.marriage_status, + ca.party, + ca.education, + ca.religious, + ca.occupation_type, + ca.occupation, + ca.service_address, + ca.telephone, + ca.household_address_prov, + ca.household_address_city, + ca.household_address_country, + ca.household_address_town, + ca.household_address_village, + ca.household_address_detail, + ca.curlive_address_prov, + ca.curlive_address_city, + ca.curlive_address_country, + ca.curlive_address_town, + ca.curlive_address_village, + ca.curlive_address_detail, + ca.inflow_reason, + ca.certificate_type, + ca.certificate_number, + ca.sign_date, + ca.end_date, + ca.residence_type, + ca.is_focus_person, + vs.grid_name, + vs.community_name as comName, + vs.street_name FROM - ca_rotators + ca_rotators as ca + left join view_grid_comm_street as vs on vs.grid_id = ca.grid_id - delete_flag = 'normal' + ca.delete_flag = 'normal' - AND rotators_name like '%${rotatorsName}%' + AND ca.rotators_name like '%${rotatorsName}%' - AND id_card like '%${idCard}%' + AND ca.id_card like '%${idCard}%' - AND telephone like '%${telephone}%' + AND ca.telephone like '%${telephone}%' + + + AND vs.grid_id_path like '%${gridId}%' - order by grid_id,rotators_id,id_card desc + order by ca.grid_id,ca.rotators_id,ca.id_card desc + SELECT + ca.grid_id as id, + ca.grid_id as value, + ca.grid_name as label, + ca.parent_id as pid + FROM + ca_bm_grid ca + WHERE + ca.grid_level IN ('level2','level3','level4') + + + + diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java index 4d0a000b8a..386fffd4d5 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java @@ -96,5 +96,10 @@ public class ConditionResultDTO implements Serializable { * 这个表 是否支持添加 即是否是多对一 eg:居民需求是多个对一个 */ private boolean supportAdd; + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java index 3c2004e714..8d16dfdb23 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java @@ -75,7 +75,6 @@ public class ResiCategoryStatsConfigController { @PostMapping("list") public Result> list(@LoginUser TokenDto tokenDTO,@RequestBody ResiCategoryStatsConfigListFormDTO formDTO){ String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; return new Result>().ok(resiCategoryStatsConfigService.list(customerId,formDTO)); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 22f83887ba..a6940e9499 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -76,7 +76,12 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { * 手机号：mobile; 身份证：id_card；只能输入数字:num */ private String validType; - + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; + /** * 排序 */ 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 e95f209aba..a21534cdce 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 @@ -81,6 +81,9 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf //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的 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql new file mode 100644 index 0000000000..cdf0174eab --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql @@ -0,0 +1,2 @@ +alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE; + 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 b58666f21c..20974d2afa 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 @@ -85,7 +85,8 @@ IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER, IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME, b.QUERY_TYPE, - b.FUN_TYPE + b.FUN_TYPE, + b.MULTI_SELECT as multiSelect FROM ic_form_query_builder b inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0') LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id ) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java index 701ce482aa..026c402318 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java @@ -114,4 +114,4 @@ public interface IcPartyMemberPointService extends BaseService getExport(PartyMemberPointListFormDTO form, TokenDto tokenDto); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java index decce16f25..99957503cf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -24,6 +24,10 @@ public class CollectListFormDTO extends PageFormDTO { */ private String startDate; private String endDate; + /** + * 户籍所在地 + */ + private String domicilePlace; private String userId; private String customerId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index 12aff48466..7e7cb6e846 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -49,11 +49,26 @@ public class IcResiCollectMemFormDTO implements Serializable { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ private String workPlace; + /** + * 备注 + */ + private String remark; + /** * 社区居民信息登记-查询返参用 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java index 9778cb6a17..75bc3b1c69 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java @@ -86,9 +86,9 @@ public class ResiCollectFormDTO implements Serializable { private String address; /** - * 1自有0租住 + * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住 2：闲置 3：未售出 */ - @NotBlank(message = "房子属于自有还是租住？", groups = {InternalShowGroup.class}) + @NotBlank(message = "房子状态不能为空", groups = {InternalShowGroup.class}) private String houseType; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index f4bd2a1886..0fcaa480d4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -38,6 +39,8 @@ public class CollectListResultDTO implements Serializable { */ private Integer totalResi; + private String domicilePlace; + private List list; @@ -73,10 +76,24 @@ public class CollectListResultDTO implements Serializable { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ private String workPlace; + /** + * 备注 + */ + private String remark; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java index 547ef63ca8..db8eb3db7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java @@ -34,6 +34,8 @@ public interface IcResiCollectDao extends BaseDao { */ List getCollectList(CollectListFormDTO formDTO); + List selectMemberList(@Param("id") String id, @Param("domicilePlace") String domicilePlace); + /** * 我上次提交的主表记录 * @param customerId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java index 8b6a20d87b..3b4b8ac3e0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java @@ -69,7 +69,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity { private String address; /** - * 1自由0租住 + * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住 2：闲置 3：未售出 */ private String houseType; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index b93190e5c5..583663a1a1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -58,8 +58,23 @@ public class IcResiMemberEntity extends BaseEpmetEntity { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ private String workPlace; + + /** + * 备注 + */ + private String remark; } 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 c6913e70cd..a7d1183196 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 @@ -2493,6 +2493,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wq.eq(IcResiUserEntity::getAgencyId, agencyId).or().like(IcResiUserEntity::getPids, agencyId)); wrapper.eq(IcResiUserEntity::getIsVolunteer, NumConstant.ONE_STR); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); List list = baseDao.selectList(wrapper); if (CollectionUtils.isEmpty(list)) { return Collections.emptyList(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index bc88226da3..f72d695c5e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -45,7 +46,6 @@ import com.epmet.service.IcUserChangeRecordService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -175,7 +175,6 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl"+customerId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -198,15 +197,15 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl> icUserList = new ArrayList<>(); do { //一千条一循环查询客户下居民数据 - PageHelper.startPage(pageNo, NumConstant.ONE_THOUSAND); + PageHelper.startPage(pageNo, NumConstant.ONE_THOUSAND,false); icUserList = icResiUserDao.getIcUserList(customerId, columns); - pageNo++; + //不需要分页了 因为sql中已经去掉了一些存在变更记录的数据了 + //pageNo++; //3.遍历封装数据 for (Map map : icUserList){ //存放一个人的类别为是的变更明细数据 - List subList = new ArrayList<>(); - String changeId = UUID.randomUUID().toString().replaceAll("-", ""); + String changeId = IdWorker.getIdStr(); for (IcResiCategoryStatsConfigDTO dto : categoryListResult.getData()){ if(map.containsKey(dto.getColumnName())&&"1".equals(map.get(dto.getColumnName()))){ detailed = new IcUserChangeDetailedEntity(); @@ -228,12 +227,10 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl NumConstant.ZERO) { - detailedList.addAll(subList); - } + if (!hash.containsKey(map.get("CREATED_BY"))) { CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY")); //被删除或被移除的工作人员，名字为空 @@ -256,21 +253,35 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl= NumConstant.FIVE_HUNDRED){ + delAndInsertChangeRecord(customerId, changeList, detailedList); + } } } while (icUserList.size() == NumConstant.ONE_THOUSAND); //4.批量新增数据,先删后增【只删除新增节点的历史数据】 //4-1.删除待处理的人员数据【这类人是指在变更记录表中不存在新增节点数据的人】 + //最后再处理一批 + delAndInsertChangeRecord(customerId, changeList, detailedList); + } + + @Transactional(rollbackFor = Exception.class) + public void delAndInsertChangeRecord(String customerId, List changeList, List detailedList) { + if (CollectionUtils.isEmpty(changeList)) { + log.info("customerId:{}初始变更记录数据 已完成!", customerId); + return; + } List icUserIdList = changeList.stream().map(IcUserChangeRecordEntity::getIcUserId).collect(Collectors.toList()); - List> partition = ListUtils.partition(icUserIdList, NumConstant.FIVE_HUNDRED); - partition.forEach(part -> { - baseDao.delByCustomerId(customerId, "add", part); - icUserChangeDetailedService.delByCustomerId(customerId, "add", part); - }); + baseDao.delByCustomerId(customerId, "add", icUserIdList); + icUserChangeDetailedService.delByCustomerId(customerId, "add", icUserIdList); log.info("初始变更记录数据，总条数->" + changeList.size()); icUserChangeRecordService.insertBatch(changeList); log.info("初始变更记录明细数据，总条数->" + detailedList.size()); icUserChangeDetailedService.insertBatch(detailedList); + changeList.clear(); + detailedList.clear(); + icUserIdList.clear(); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql new file mode 100644 index 0000000000..e10f045969 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql @@ -0,0 +1,2 @@ +alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE VARCHAR(64) DEFAULT '' comment '户籍所在地行政地区编码' AFTER DOMICILE_PLACE; +alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE_PATH VARCHAR(255) DEFAULT '' comment '户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203' AFTER DOMICILE_PLACE_CODE; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql new file mode 100644 index 0000000000..4d12e2fca0 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql @@ -0,0 +1,2 @@ +alter table ic_resi_collect MODIFY COLUMN `HOUSE_TYPE` varchar(1) NOT NULL COMMENT '房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住 2：闲置 3：未售出'; +alter table ic_resi_member add COLUMN REMARK VARCHAR(512) DEFAULT '' COMMENT '备注' AFTER WORK_PLACE; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index ebfe3767fd..d2ca4339c1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -16,16 +16,19 @@ - + + - select m.`NAME` AS memberName, m.ID_NUM AS memberIdNum, @@ -52,10 +58,16 @@ m.HE_SUAN_COUNT AS heSuanCount, m.YMJZ AS ymjz, m.DOMICILE_PLACE as domicilePlace, - m.WORK_PLACE as workPlace + m.DOMICILE_PLACE_CODE as domicilePlaceCode, + m.DOMICILE_PLACE_CODE_PATH as domicilePlaceCodePath, + m.WORK_PLACE as workPlace, + m.REMARK as remark from ic_resi_member m where m.DEL_FLAG = 0 and m.IC_RESI_COLLECT_ID = #{id} + + AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%') + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml index b9bc9300dd..13db077a3c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml @@ -14,7 +14,10 @@ m.HE_SUAN_COUNT, m.YMJZ, m.DOMICILE_PLACE, - m.WORK_PLACE + m.WORK_PLACE, + m.DOMICILE_PLACE_CODE, + m.DOMICILE_PLACE_CODE_PATH, + m.REMARK FROM ic_resi_member m WHERE diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 81f3c65f49..edb2455bee 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -128,6 +128,16 @@ ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{colValue},'%') + + + + + + and ${subCondition.tableName}.${colValue} ='1' + + + +