diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberZxhDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberZxhDTO.java new file mode 100755 index 0000000000..1e10cb15dc --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberZxhController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberZxhController.java new file mode 100755 index 0000000000..085ee1dc7c --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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> page(@RequestParam Map params){ + PageData page = icPartyMemberZxhService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IcPartyMemberZxhDTO data = icPartyMemberZxhService.get(id); + return new Result().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 params, HttpServletResponse response) throws Exception { + List list = icPartyMemberZxhService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcPartyMemberZxhExcel.class); + } + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java index 8f4f8936f9..5a3d65ad63 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java +++ b/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> + * @Author: lichao + * @Date: 2024/3/26 10:09 + */ + @GetMapping("partyMemberZxhList") + public Result> partyMemberZxhList(@RequestParam Map params){ + List result = icPartyMemberZxhService.list(params); + return new Result>().ok(result); + } /** * @Description: 种都力量-企业列表 * @param : @@ -228,8 +242,8 @@ public class YiFengScreenController { } @GetMapping("selectPartyPlaceList") - public Result> getPageList(){ - List page = icPartyPlaceService.selectPartyPlaceList(); + public Result> getPageList(Integer type){ + List page = icPartyPlaceService.selectPartyPlaceList(type); return new Result>().ok(page); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberZxhDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberZxhDao.java new file mode 100755 index 0000000000..0d1e59fb90 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberZxhEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberZxhEntity.java new file mode 100755 index 0000000000..68e01e77ca --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberZxhExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberZxhExcel.java new file mode 100755 index 0000000000..5b65d43a34 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/IcPartyMemberZxhRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/IcPartyMemberZxhRedis.java new file mode 100755 index 0000000000..d86d0507fa --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + } + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberZxhService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberZxhService.java new file mode 100755 index 0000000000..5268b4f547 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2024-03-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2024-03-26 + */ + List list(Map 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); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyPlaceService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyPlaceService.java index 071cbe8596..20d4591d56 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyPlaceService.java +++ b/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 { List getPageList(Map params); - List selectPartyPlaceList(); + List selectPartyPlaceList(Integer type); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberZxhServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberZxhServiceImpl.java new file mode 100755 index 0000000000..a497fb4a5b --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 implements IcPartyMemberZxhService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPartyMemberZxhDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPartyMemberZxhDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + String orgId = (String)params.get("orgId"); + + QueryWrapper 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)); + } + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java index a11fd59cd5..18c05e62b2 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java +++ b/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 resultDTOS = new ArrayList<>(); LambdaQueryWrapper 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 entityPList = baseDao.selectList(queryWrapperP); if (entityPList.size() > 0){ resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyPlaceTreeResultDTO.class); @@ -118,11 +123,16 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl selectPartyPlaceList() { + public List selectPartyPlaceList(Integer type) { List resultDTOS = new ArrayList<>(); LambdaQueryWrapper 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 entityPList = baseDao.selectList(queryWrapperP); if (entityPList.size() > 0){ resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyPlaceTreeResultDTO.class); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberZxhDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberZxhDao.xml new file mode 100755 index 0000000000..145aa7a282 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberZxhDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file