修改红色移风

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberZxhDTO.java

@@ -0,0 +1,116 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.partymember.dto.partymember;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+@Data
+public class IcPartyMemberZxhDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 党组织
+     */
+	private String orgId;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 
+     */
+	private String headPhoto;
+
+    /**
+     * 
+     */
+	private String gender;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 1:组长 2：正常
+     */
+	private Integer type;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberZxhController.java

@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.modules.partymember.excel.IcPartyMemberZxhExcel;
+import com.epmet.modules.partymember.service.IcPartyMemberZxhService;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberZxhDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+@RestController
+@RequestMapping("icpartymemberzxh")
+public class IcPartyMemberZxhController {
+    
+    @Autowired
+    private IcPartyMemberZxhService icPartyMemberZxhService;
+
+    @GetMapping("page")
+    public Result<PageData<IcPartyMemberZxhDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPartyMemberZxhDTO> page = icPartyMemberZxhService.page(params);
+        return new Result<PageData<IcPartyMemberZxhDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcPartyMemberZxhDTO> get(@PathVariable("id") String id){
+        IcPartyMemberZxhDTO data = icPartyMemberZxhService.get(id);
+        return new Result<IcPartyMemberZxhDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcPartyMemberZxhDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icPartyMemberZxhService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcPartyMemberZxhDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icPartyMemberZxhService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icPartyMemberZxhService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcPartyMemberZxhDTO> list = icPartyMemberZxhService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPartyMemberZxhExcel.class);
+    }
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java

@@ -82,7 +82,21 @@ public class YiFengScreenController {
     private IcSeedCompanyService icSeedCompanyService;
     @Autowired
     private IcSeedPowerCompanyService icSeedPowerCompanyService;
+    @Autowired
+    private IcPartyMemberZxhService icPartyMemberZxhService;
 
+    /**
+     * @Description: 党建中心户
+     * @param params:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.IcPartyMemberZxhDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/26 10:09
+     */
+    @GetMapping("partyMemberZxhList")
+    public Result<List<IcPartyMemberZxhDTO>> partyMemberZxhList(@RequestParam Map<String, Object> params){
+        List<IcPartyMemberZxhDTO> result = icPartyMemberZxhService.list(params);
+        return new Result<List<IcPartyMemberZxhDTO>>().ok(result);
+    }
     /**
      * @Description: 种都力量-企业列表
      * @param :
@@ -228,8 +242,8 @@ public class YiFengScreenController {
     }
 
     @GetMapping("selectPartyPlaceList")
-    public Result<List<IcPartyPlaceTreeResultDTO>> getPageList(){
+    public Result<List<IcPartyPlaceTreeResultDTO>> getPageList(Integer type){
-        List<IcPartyPlaceTreeResultDTO> page = icPartyPlaceService.selectPartyPlaceList();
+        List<IcPartyPlaceTreeResultDTO> page = icPartyPlaceService.selectPartyPlaceList(type);
         return new Result<List<IcPartyPlaceTreeResultDTO>>().ok(page);
     }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberZxhDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.partymember.entity.IcPartyMemberZxhEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+@Mapper
+public interface IcPartyMemberZxhDao extends BaseDao<IcPartyMemberZxhEntity> {
+	
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberZxhEntity.java

@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_member_zxh")
+public class IcPartyMemberZxhEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 党组织
+     */
+	private String orgId;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 
+     */
+	private String headPhoto;
+
+    /**
+     * 
+     */
+	private String gender;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 1:组长 2：正常
+     */
+	private Integer type;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberZxhExcel.java

@@ -0,0 +1,83 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+@Data
+public class IcPartyMemberZxhExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "党组织")
+    private String orgId;
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    @Excel(name = "")
+    private String headPhoto;
+
+    @Excel(name = "")
+    private String gender;
+
+    @Excel(name = "地址")
+    private String address;
+
+    @Excel(name = "1:组长 2：正常")
+    private Integer type;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/IcPartyMemberZxhRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+@Component
+public class IcPartyMemberZxhRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

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

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.service;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.modules.partymember.entity.IcPartyMemberZxhEntity;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberZxhDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+public interface IcPartyMemberZxhService extends BaseService<IcPartyMemberZxhEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcPartyMemberZxhDTO>
+     * @author generator
+     * @date 2024-03-26
+     */
+    PageData<IcPartyMemberZxhDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcPartyMemberZxhDTO>
+     * @author generator
+     * @date 2024-03-26
+     */
+    List<IcPartyMemberZxhDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcPartyMemberZxhDTO
+     * @author generator
+     * @date 2024-03-26
+     */
+    IcPartyMemberZxhDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2024-03-26
+     */
+    void save(IcPartyMemberZxhDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2024-03-26
+     */
+    void update(IcPartyMemberZxhDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2024-03-26
+     */
+    void delete(String[] ids);
+}

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

@@ -80,5 +80,5 @@ public interface IcPartyPlaceService extends BaseService<IcPartyPlaceEntity> {
     List<IcPartyPlaceTreeResultDTO> getPageList(Map<String, Object> params);
 
 
-    List<IcPartyPlaceTreeResultDTO> selectPartyPlaceList();
+    List<IcPartyPlaceTreeResultDTO> selectPartyPlaceList(Integer type);
 }

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

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.service.impl;
+
+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.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.modules.partymember.dao.IcPartyMemberZxhDao;
+import com.epmet.modules.partymember.entity.IcPartyMemberZxhEntity;
+import com.epmet.modules.partymember.redis.IcPartyMemberZxhRedis;
+import com.epmet.modules.partymember.service.IcPartyMemberZxhService;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberZxhDTO;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员中心户
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2024-03-26
+ */
+@Service
+public class IcPartyMemberZxhServiceImpl extends BaseServiceImpl<IcPartyMemberZxhDao, IcPartyMemberZxhEntity> implements IcPartyMemberZxhService {
+
+
+    @Override
+    public PageData<IcPartyMemberZxhDTO> page(Map<String, Object> params) {
+        IPage<IcPartyMemberZxhEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcPartyMemberZxhDTO.class);
+    }
+
+    @Override
+    public List<IcPartyMemberZxhDTO> list(Map<String, Object> params) {
+        List<IcPartyMemberZxhEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcPartyMemberZxhDTO.class);
+    }
+
+    private QueryWrapper<IcPartyMemberZxhEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        String orgId = (String)params.get("orgId");
+
+        QueryWrapper<IcPartyMemberZxhEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        wrapper.eq(StringUtils.isNotBlank(orgId), "ORG_ID", orgId);
+
+        wrapper.orderByAsc("TYPE");
+        return wrapper;
+    }
+
+    @Override
+    public IcPartyMemberZxhDTO get(String id) {
+        IcPartyMemberZxhEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcPartyMemberZxhDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcPartyMemberZxhDTO dto) {
+        IcPartyMemberZxhEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberZxhEntity.class);
+        saveOrUpdate(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcPartyMemberZxhDTO dto) {
+        IcPartyMemberZxhEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberZxhEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -99,7 +99,12 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl<IcPartyPlaceDao, Ic
         List<IcPartyPlaceTreeResultDTO> resultDTOS = new ArrayList<>();
 
         LambdaQueryWrapper<IcPartyPlaceEntity> queryWrapperP = new LambdaQueryWrapper<>();
-        queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0).orderByAsc(IcPartyPlaceEntity::getSort);
+//        queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0).orderByAsc(IcPartyPlaceEntity::getSort);
+        queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0);
+        if (params.get("type") !=null){
+            queryWrapperP.eq(IcPartyPlaceEntity::getType,params.get("type"));
+        }
+        queryWrapperP.orderByAsc(IcPartyPlaceEntity::getSort);
         List<IcPartyPlaceEntity> entityPList = baseDao.selectList(queryWrapperP);
         if (entityPList.size() > 0){
             resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyPlaceTreeResultDTO.class);
@@ -118,11 +123,16 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl<IcPartyPlaceDao, Ic
     }
 
     @Override
-    public List<IcPartyPlaceTreeResultDTO> selectPartyPlaceList() {
+    public List<IcPartyPlaceTreeResultDTO> selectPartyPlaceList(Integer type) {
         List<IcPartyPlaceTreeResultDTO> resultDTOS = new ArrayList<>();
 
         LambdaQueryWrapper<IcPartyPlaceEntity> queryWrapperP = new LambdaQueryWrapper<>();
-        queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0).orderByAsc(IcPartyPlaceEntity::getSort);
+        queryWrapperP.eq(IcPartyPlaceEntity::getParentId,0);
+        if (type !=null){
+            queryWrapperP.eq(IcPartyPlaceEntity::getType,type);
+        }
+        queryWrapperP.orderByAsc(IcPartyPlaceEntity::getSort);
+
         List<IcPartyPlaceEntity> entityPList = baseDao.selectList(queryWrapperP);
         if (entityPList.size() > 0){
             resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyPlaceTreeResultDTO.class);

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberZxhDao.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.partymember.dao.IcPartyMemberZxhDao">
+
+    <resultMap type="com.epmet.modules.partymember.entity.IcPartyMemberZxhEntity" id="icPartyMemberZxhMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="name" column="NAME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="headPhoto" column="HEAD_PHOTO"/>
+        <result property="gender" column="GENDER"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="type" column="TYPE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>