From d988478bb3f18c438459e77ccf18b2ae75847794 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Dec 2023 18:04:56 +0800
Subject: [PATCH] 业委会接口
---
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java | 126 ++++
src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeMemberServiceImpl.java | 69 ++
src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java | 69 ++
src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml | 39 +
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 44 +
src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeMemberVO.java | 35 +
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java | 126 ++++
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 18
src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeVO.java | 35 +
src/main/java/org/springblade/modules/house/mapper/HouseMapper.java | 8
src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java | 5
src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeWrapper.java | 50 +
src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeMemberWrapper.java | 50 +
src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.java | 60 ++
src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeDTO.java | 34 +
src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.xml | 139 +++++
src/main/java/org/springblade/modules/house/service/IHouseService.java | 2
src/main/java/org/springblade/modules/house/controller/HouseController.java | 8
src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeMemberEntity.java | 158 +++++
src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeMemberService.java | 60 ++
src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java | 61 ++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 6
src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.xml | 131 ++++
src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.java | 59 ++
src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java | 174 ++++++
src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeMemberDTO.java | 34 +
26 files changed, 1,568 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
index 7568f8e..2bf9754 100644
--- a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
@@ -3,23 +3,38 @@
<mapper namespace="org.springblade.modules.checkInRecords.mapper.CheckInRecordsMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="checkInRecordsResultMap" type="org.springblade.modules.checkInRecords.entity.CheckInRecordsEntity">
+ <resultMap id="checkInRecordsResultMap" type="org.springblade.modules.checkInRecords.vo.CheckInRecordsVO">
</resultMap>
<select id="selectCheckInRecordsPage" resultMap="checkInRecordsResultMap">
- select * from jczz_check_in_records
+ SELECT
+ jcir.id,
+ jcir.create_user_id,
+ jcir.create_time,
+ jcir.work_theme,
+ jcir.work_content,
+ jcir.img,
+ jcir.lng,
+ jcir.lat,
+ jcir.address,
+ jcir.deleted_flag,
+ bu.`name`
+ FROM
+ jczz_check_in_records jcir
+ LEFT JOIN blade_user bu ON bu.id = jcir.create_user_id
<where>
- <if test="checkInRecords.id != null "> and id = #{checkInRecords.id}</if>
- <if test="checkInRecords.createUserId != null "> and create_user_id = #{checkInRecords.createUserId}</if>
- <if test="checkInRecords.createTime != null "> and create_time = #{checkInRecords.createTime}</if>
- <if test="checkInRecords.workTheme != null and workTheme != ''"> and work_theme = #{checkInRecords.workTheme}</if>
- <if test="checkInRecords.workContent != null and workContent != ''"> and work_content = #{checkInRecords.workContent}</if>
- <if test="checkInRecords.img != null and img != ''"> and img = #{checkInRecords.img}</if>
- <if test="checkInRecords.lng != null and lng != ''"> and lng = #{checkInRecords.lng}</if>
- <if test="checkInRecords.lat != null and lat != ''"> and lat = #{checkInRecords.lat}</if>
- <if test="checkInRecords.address != null and address != ''"> and address = #{checkInRecords.address}</if>
- <if test="checkInRecords.deletedFlag != null "> and deleted_flag = #{checkInRecords.deletedFlag}</if>
+ <if test="checkInRecords.id != null "> and jcir.id = #{checkInRecords.id}</if>
+ <if test="checkInRecords.createUserId != null "> and jcir.create_user_id = #{checkInRecords.createUserId}</if>
+ <if test="checkInRecords.createTime != null "> and jcir.create_time = #{checkInRecords.createTime}</if>
+ <if test="checkInRecords.workTheme != null and checkInRecords.workTheme != ''"> and jcir.work_theme = #{checkInRecords.workTheme}</if>
+ <if test="checkInRecords.workContent != null and checkInRecords.workContent != ''"> and jcir.work_content = #{checkInRecords.workContent}</if>
+ <if test="checkInRecords.img != null and checkInRecords.img != ''"> and jcir.img = #{checkInRecords.img}</if>
+ <if test="checkInRecords.lng != null and checkInRecords.lng != ''"> and jcir.lng = #{checkInRecords.lng}</if>
+ <if test="checkInRecords.lat != null and checkInRecords.lat != ''"> and jcir.lat = #{checkInRecords.lat}</if>
+ <if test="checkInRecords.address != null and checkInRecords.address != ''"> and jcir.address = #{checkInRecords.address}</if>
+ <if test="checkInRecords.deletedFlag != null "> and jcir.deleted_flag = #{checkInRecords.deletedFlag}</if>
+ <if test="checkInRecords.name != null and checkInRecords.name !='' "> and bu.name like concat('%',#{checkInRecords.name},'%') </if>
</where>
</select>
diff --git a/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java b/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java
index c8b0a20..1c6ba69 100644
--- a/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java
+++ b/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java
@@ -16,10 +16,9 @@
*/
package org.springblade.modules.checkInRecords.vo;
-import org.springblade.modules.checkInRecords.entity.CheckInRecordsEntity;
-import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.checkInRecords.entity.CheckInRecordsEntity;
/**
* 打卡记录表 视图实体类
@@ -32,4 +31,6 @@
public class CheckInRecordsVO extends CheckInRecordsEntity {
private static final long serialVersionUID = 1L;
+ private String name;
+
}
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseController.java b/src/main/java/org/springblade/modules/house/controller/HouseController.java
index 1452628..20c41f1 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseController.java
@@ -201,8 +201,12 @@
@GetMapping("getHouseStatistics")
- public R getHouseStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
- Map<String, Object> result = houseService.getHouseStatistics(code, roleType);
+ public R getHouseStatistics(@RequestParam("code") String code,
+ @RequestParam("roleType") String roleType,
+ @RequestParam(value = "aoiCode", required = false) String aoiCode,
+ @RequestParam(value = "buildingCode", required = false) String buildingCode,
+ @RequestParam(value = "uniCode", required = false) String uniCode) {
+ Map<String, Object> result = houseService.getHouseStatistics(code, roleType,aoiCode,buildingCode,uniCode);
return R.data(result);
}
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
index e456c1b..1c0352f 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
@@ -70,8 +70,8 @@
Map<String, HouseTree> getHouseTree(@Param("houseParam") HouseParam houseParam,
@Param("list") List<String> list);
- Integer getHouseStatisticsOne(String code, Long userId);
- Integer getHouseStatisticsTwo(String code, Long userId);
- Integer getHouseStatisticsThree(String code, Long userId);
- Integer getHouseStatisticsFour(String code, Long userId);
+ Integer getHouseStatisticsOne(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
+ Integer getHouseStatisticsTwo(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
+ Integer getHouseStatisticsThree(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
+ Integer getHouseStatisticsFour(String code, Long userId,String aoiCode,String buildingCode,String uniCode);
}
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 5e6d16b..f85fa3d 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -263,6 +263,17 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="uniCode != null and uniCode != ''">
+ and jda.unit_code=#{uniCode}
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT DISTINCT
@@ -294,6 +305,17 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="uniCode != null and uniCode != ''">
+ and jda.unit_code=#{uniCode}
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT DISTINCT
@@ -321,6 +343,17 @@
WHERE
jda.nei_code = #{code}
AND jhh.is_deleted = 0
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="uniCode != null and uniCode != ''">
+ and jda.unit_code=#{uniCode}
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT
@@ -350,6 +383,17 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
+ <if test="buildingCode != null and buildingCode != ''">
+ and jda.building_code=#{buildingCode}
+ </if>
+
+ <if test="uniCode != null and uniCode != ''">
+ and jda.unit_code=#{uniCode}
+ </if>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT DISTINCT
diff --git a/src/main/java/org/springblade/modules/house/service/IHouseService.java b/src/main/java/org/springblade/modules/house/service/IHouseService.java
index 1f63ffe..8adf903 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseService.java
@@ -77,5 +77,5 @@
*/
void importHouseAndHold(List<HouseAndHoldExcel> data, Boolean isCovered);
- Map<String, Object> getHouseStatistics(String code, String roleType);
+ Map<String, Object> getHouseStatistics(String code, String roleType,String aoiCode,String buildingCode,String uniCode);
}
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 442c307..4eeedc1 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -301,23 +301,23 @@
}
@Override
- public Map<String, Object> getHouseStatistics(String code, String roleType) {
+ public Map<String, Object> getHouseStatistics(String code, String roleType,String aoiCode,String buildingCode,String uniCode) {
Map<String, Object> objectObjectHashMap = new HashMap<>();
if (roleType.equals("1")) {
// result1 查询楼栋数 result2 查询房屋套数 result3 查询住户数 result4 查询单元数
- Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId());
- Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId());
- Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId());
- Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId());
+ Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId(),aoiCode,buildingCode,uniCode);
+ Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId(),aoiCode,buildingCode,uniCode);
+ Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId(),aoiCode,buildingCode,uniCode);
+ Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId(),aoiCode,buildingCode,uniCode);
objectObjectHashMap.put("result1", result1);
objectObjectHashMap.put("result2", result2);
objectObjectHashMap.put("result3", result3);
objectObjectHashMap.put("result4", result4);
} else {
- Integer result1 = baseMapper.getHouseStatisticsOne(code, null);
- Integer result2 = baseMapper.getHouseStatisticsTwo(code, null);
- Integer result3 = baseMapper.getHouseStatisticsThree(code, null);
- Integer result4 = baseMapper.getHouseStatisticsFour(code, null);
+ Integer result1 = baseMapper.getHouseStatisticsOne(code, null,aoiCode,buildingCode,uniCode);
+ Integer result2 = baseMapper.getHouseStatisticsTwo(code, null,aoiCode,buildingCode,uniCode);
+ Integer result3 = baseMapper.getHouseStatisticsThree(code, null,aoiCode,buildingCode,uniCode);
+ Integer result4 = baseMapper.getHouseStatisticsFour(code, null,aoiCode,buildingCode,uniCode);
objectObjectHashMap.put("result1", result1);
objectObjectHashMap.put("result2", result2);
objectObjectHashMap.put("result3", result3);
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
new file mode 100644
index 0000000..fdc8cb1
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeVO;
+import org.springblade.modules.ownersCommittee.wrapper.OwnersCommitteeWrapper;
+import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 业委会表 控制器
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-ownersCommittee/ownersCommittee")
+@Api(value = "业委会表", tags = "业委会表接口")
+public class OwnersCommitteeController extends BladeController {
+
+ private final IOwnersCommitteeService ownersCommitteeService;
+
+ /**
+ * 业委会表 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入ownersCommittee")
+ public R<OwnersCommitteeVO> detail(OwnersCommitteeEntity ownersCommittee) {
+ OwnersCommitteeEntity detail = ownersCommitteeService.getOne(Condition.getQueryWrapper(ownersCommittee));
+ return R.data(OwnersCommitteeWrapper.build().entityVO(detail));
+ }
+ /**
+ * 业委会表 分页
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入ownersCommittee")
+ public R<IPage<OwnersCommitteeVO>> list(OwnersCommitteeEntity ownersCommittee, Query query) {
+ IPage<OwnersCommitteeEntity> pages = ownersCommitteeService.page(Condition.getPage(query), Condition.getQueryWrapper(ownersCommittee));
+ return R.data(OwnersCommitteeWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 业委会表 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入ownersCommittee")
+ public R<IPage<OwnersCommitteeVO>> page(OwnersCommitteeVO ownersCommittee, Query query) {
+ IPage<OwnersCommitteeVO> pages = ownersCommitteeService.selectOwnersCommitteePage(Condition.getPage(query), ownersCommittee);
+ return R.data(pages);
+ }
+
+ /**
+ * 业委会表 新增
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入ownersCommittee")
+ public R save(@Valid @RequestBody OwnersCommitteeEntity ownersCommittee) {
+ return R.status(ownersCommitteeService.save(ownersCommittee));
+ }
+
+ /**
+ * 业委会表 修改
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入ownersCommittee")
+ public R update(@Valid @RequestBody OwnersCommitteeEntity ownersCommittee) {
+ return R.status(ownersCommitteeService.updateById(ownersCommittee));
+ }
+
+ /**
+ * 业委会表 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入ownersCommittee")
+ public R submit(@Valid @RequestBody OwnersCommitteeEntity ownersCommittee) {
+ return R.status(ownersCommitteeService.saveOrUpdate(ownersCommittee));
+ }
+
+ /**
+ * 业委会表 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(ownersCommitteeService.removeBatchByIds(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
new file mode 100644
index 0000000..268c0cb
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeMemberVO;
+import org.springblade.modules.ownersCommittee.wrapper.OwnersCommitteeMemberWrapper;
+import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeMemberService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 业委会成员表 控制器
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-ownersCommitteeMember/ownersCommitteeMember")
+@Api(value = "业委会成员表", tags = "业委会成员表接口")
+public class OwnersCommitteeMemberController extends BladeController {
+
+ private final IOwnersCommitteeMemberService ownersCommitteeService;
+
+ /**
+ * 业委会成员表 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入ownersCommittee")
+ public R<OwnersCommitteeMemberVO> detail(OwnersCommitteeMemberEntity ownersCommittee) {
+ OwnersCommitteeMemberEntity detail = ownersCommitteeService.getOne(Condition.getQueryWrapper(ownersCommittee));
+ return R.data(OwnersCommitteeMemberWrapper.build().entityVO(detail));
+ }
+ /**
+ * 业委会成员表 分页
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入ownersCommittee")
+ public R<IPage<OwnersCommitteeMemberVO>> list(OwnersCommitteeMemberEntity ownersCommittee, Query query) {
+ IPage<OwnersCommitteeMemberEntity> pages = ownersCommitteeService.page(Condition.getPage(query), Condition.getQueryWrapper(ownersCommittee));
+ return R.data(OwnersCommitteeMemberWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 业委会成员表 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入ownersCommittee")
+ public R<IPage<OwnersCommitteeMemberVO>> page(OwnersCommitteeMemberVO ownersCommittee, Query query) {
+ IPage<OwnersCommitteeMemberVO> pages = ownersCommitteeService.selectOwnersCommitteeMemberPage(Condition.getPage(query), ownersCommittee);
+ return R.data(pages);
+ }
+
+ /**
+ * 业委会成员表 新增
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入ownersCommittee")
+ public R save(@Valid @RequestBody OwnersCommitteeMemberEntity ownersCommittee) {
+ return R.status(ownersCommitteeService.save(ownersCommittee));
+ }
+
+ /**
+ * 业委会成员表 修改
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入ownersCommittee")
+ public R update(@Valid @RequestBody OwnersCommitteeMemberEntity ownersCommittee) {
+ return R.status(ownersCommitteeService.updateById(ownersCommittee));
+ }
+
+ /**
+ * 业委会成员表 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入ownersCommittee")
+ public R submit(@Valid @RequestBody OwnersCommitteeMemberEntity ownersCommittee) {
+ return R.status(ownersCommitteeService.saveOrUpdate(ownersCommittee));
+ }
+
+ /**
+ * 业委会成员表 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(ownersCommitteeService.removeBatchByIds(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeDTO.java b/src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeDTO.java
new file mode 100644
index 0000000..c3f73c7
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeDTO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.dto;
+
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 业委会表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OwnersCommitteeDTO extends OwnersCommitteeEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeMemberDTO.java b/src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeMemberDTO.java
new file mode 100644
index 0000000..9b11006
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/dto/OwnersCommitteeMemberDTO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.dto;
+
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 业委会成员表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OwnersCommitteeMemberDTO extends OwnersCommitteeMemberEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java b/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
new file mode 100644
index 0000000..0ab1f45
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 业委会表 实体类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@ApiModel(value = "OwnersCommittee对象" , description = "业委会表")
+@Data
+@TableName("jczz_owners_committee")
+public class OwnersCommitteeEntity implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+
+ /** id */
+ @ApiModelProperty(value = "主键ID", example = "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /** 小区id */
+ @ApiModelProperty(value = "小区id", example = "")
+ @TableField("area_id")
+ private Integer areaId;
+
+ /** 小区名称 */
+ @ApiModelProperty(value = "小区名称", example = "")
+ @TableField("area_name")
+ private String areaName;
+
+ /** 建立时间 */
+ @ApiModelProperty(value = "建立时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("establish_time")
+ private Date establishTime;
+
+ /** 图片地址 */
+ @ApiModelProperty(value = "图片地址", example = "")
+ @TableField("image_url")
+ private String imageUrl;
+
+ /** 纬度 */
+ @ApiModelProperty(value = "纬度", example = "")
+ @TableField("latitude")
+ private String latitude;
+
+ /** 经度 */
+ @ApiModelProperty(value = "经度", example = "")
+ @TableField("longitude")
+ private String longitude;
+
+ /** 地址 */
+ @ApiModelProperty(value = "地址", example = "")
+ @TableField("location")
+ private String location;
+
+ /** 手机号 */
+ @ApiModelProperty(value = "手机号", example = "")
+ @TableField("mobile")
+ private String mobile;
+
+ /** 业委会名称 */
+ @ApiModelProperty(value = "业委会名称", example = "")
+ @TableField("name")
+ private String name;
+
+ /** 总人数 */
+ @ApiModelProperty(value = "总人数", example = "")
+ @TableField("people_total")
+ private String peopleTotal;
+
+ /** 负责人id */
+ @ApiModelProperty(value = "负责人id", example = "")
+ @TableField("principal_id")
+ private Long principalId;
+
+ /** 负责人名称 */
+ @ApiModelProperty(value = "负责人名称", example = "")
+ @TableField("principal_name")
+ private String principalName;
+
+ /** 简介 */
+ @ApiModelProperty(value = "简介", example = "")
+ @TableField("profile")
+ private String profile;
+
+ /** 业委会届别 */
+ @ApiModelProperty(value = "业委会届别", example = "")
+ @TableField("session")
+ private Integer session;
+
+ /** 开始时间 */
+ @ApiModelProperty(value = "开始时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("start_time")
+ private Date startTime;
+
+ /** 截止时间 */
+ @ApiModelProperty(value = "截止时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("end_time")
+ private Date endTime;
+
+ /** 排序 */
+ @ApiModelProperty(value = "排序", example = "")
+ @TableField("sort")
+ private Integer sort;
+
+ /** 0 正常 1 关闭 */
+ @ApiModelProperty(value = "0 正常 1 关闭", example = "")
+ @TableField("status")
+ private Integer status;
+
+ /** 0 业委会 1 物管会/自管会 */
+ @ApiModelProperty(value = "0 业委会 1 物管会/自管会", example = "")
+ @TableField("type")
+ private Integer type;
+
+ /** 创建人 */
+ @ApiModelProperty(value = "创建人", example = "")
+ @TableField("create_id")
+ private Long createId;
+
+ /** 更新人 */
+ @ApiModelProperty(value = "更新人", example = "")
+ @TableField("update_id")
+ private Integer updateId;
+
+ /** 创建时间 */
+ @ApiModelProperty(value = "创建时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
+ private Date createTime;
+
+ /** 更新时间 */
+ @ApiModelProperty(value = "更新时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ /** 0否 1是 */
+ @ApiModelProperty(value = "0否 1是", example = "")
+ @TableField("delete_flag")
+ @TableLogic
+ private Integer deleteFlag;
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeMemberEntity.java b/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeMemberEntity.java
new file mode 100644
index 0000000..fd12603
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeMemberEntity.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import liquibase.pro.packaged.I;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 业委会成员表 实体类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@ApiModel(value = "OwnersCommitteeMember对象" , description = "业委会成员表")
+@Data
+@TableName("jczz_owners_committee_member")
+public class OwnersCommitteeMemberEntity implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+
+ /** id */
+ @ApiModelProperty(value = "主键ID", example = "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /** 小区id */
+ @ApiModelProperty(value = "小区id", example = "")
+ @TableField("area_id")
+ private Integer areaId;
+
+ /** 创建人 */
+ @ApiModelProperty(value = "创建人", example = "")
+ @TableField("create_id")
+ private Long createId;
+
+ /** 学历 */
+ @ApiModelProperty(value = "学历", example = "")
+ @TableField("education")
+ private String education;
+
+ /** 身份证号码 */
+ @ApiModelProperty(value = "身份证号码", example = "")
+ @TableField("identity_num")
+ private Integer identityNum;
+
+ /** 身份证类型 */
+ @ApiModelProperty(value = "身份证类型", example = "")
+ @TableField("identity_type")
+ private Integer identityType;
+
+ /** 图片 */
+ @ApiModelProperty(value = "图片", example = "")
+ @TableField("image_url")
+ private String imageUrl;
+
+ /** 加入时间 */
+ @ApiModelProperty(value = "加入时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("join_time")
+ private Date joinTime;
+
+ /** 手机 */
+ @ApiModelProperty(value = "手机", example = "")
+ @TableField("mobile")
+ private String mobile;
+
+ /** 名称 */
+ @ApiModelProperty(value = "名称", example = "")
+ @TableField("name")
+ private String name;
+
+ /** 业主委员会名称 */
+ @ApiModelProperty(value = "业主委员会名称", example = "")
+ @TableField("owners_committee_name")
+ private String ownersCommitteeName;
+
+ /** 业主委员会id */
+ @ApiModelProperty(value = "业主委员会id", example = "")
+ @TableField("owners_id")
+ private Integer ownersId;
+
+ /** 政治面貌 */
+ @ApiModelProperty(value = "政治面貌", example = "")
+ @TableField("political_status")
+ private String politicalStatus;
+
+ /** 职务：1主任，2副主任，3秘书长，4委员 */
+ @ApiModelProperty(value = "职务：1主任，2副主任，3秘书长，4委员", example = "")
+ @TableField("post")
+ private String post;
+
+ /** 简介 */
+ @ApiModelProperty(value = "简介", example = "")
+ @TableField("profile")
+ private String profile;
+
+ /** 性别 */
+ @ApiModelProperty(value = "性别", example = "")
+ @TableField("sex")
+ private String sex;
+
+ /** 排序 */
+ @ApiModelProperty(value = "排序", example = "")
+ @TableField("sort")
+ private Integer sort;
+
+ /** 0 正常 1 关闭 */
+ @ApiModelProperty(value = "0 正常 1 关闭", example = "")
+ @TableField("status")
+ private Integer status;
+
+ /** 更新人 */
+ @ApiModelProperty(value = "更新人", example = "")
+ @TableField("update_id")
+ private Long updateId;
+
+ /** 更新时间 */
+ @ApiModelProperty(value = "更新时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ /** 创建时间 */
+ @ApiModelProperty(value = "创建时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
+ private Date createTime;
+
+ /** 0否 1 是 */
+ @ApiModelProperty(value = "0否 1 是", example = "")
+ @TableField("delete_flag")
+ @TableLogic
+ private Integer deleteFlag;
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.java b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.java
new file mode 100644
index 0000000..787d039
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.mapper;
+
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springblade.modules.ownersCommittee.dto.OwnersCommitteeDTO;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 业委会表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+public interface OwnersCommitteeMapper extends BaseMapper<OwnersCommitteeEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param ownersCommittee
+ * @return
+ */
+ List<OwnersCommitteeVO> selectOwnersCommitteePage(IPage page,@Param("ownersCommittee") OwnersCommitteeVO ownersCommittee);
+
+
+ /**
+ * 查询业委会表
+ *
+ * @param id 业委会表ID
+ * @return 业委会表
+ */
+ public OwnersCommitteeDTO selectOwnersCommitteeById(Integer id);
+
+ /**
+ * 查询业委会表列表
+ *
+ * @param ownersCommitteeDTO 业委会表
+ * @return 业委会表集合
+ */
+ public List<OwnersCommitteeDTO> selectOwnersCommitteeList(OwnersCommitteeDTO ownersCommitteeDTO);
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.xml b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.xml
new file mode 100644
index 0000000..18c88fa
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMapper.xml
@@ -0,0 +1,139 @@
+<?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="org.springblade.modules.ownersCommittee.mapper.OwnersCommitteeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="ownersCommitteeResultMap" type="org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity">
+ </resultMap>
+
+
+ <select id="selectOwnersCommitteePage" resultMap="ownersCommitteeResultMap">
+ <include refid="selectOwnersCommittee"/>
+ <where>
+ <if test="ownersCommittee.id != null "> and id = #{ownersCommittee.id}</if>
+ <if test="ownersCommittee.areaId != null "> and area_id = #{ownersCommittee.areaId}</if>
+ <if test="ownersCommittee.areaName != null and ownersCommittee.areaName != ''"> and area_name = #{ownersCommittee.areaName}</if>
+ <if test="ownersCommittee.establishTime != null "> and establish_time = #{ownersCommittee.establishTime}</if>
+ <if test="ownersCommittee.imageUrl != null and ownersCommittee.imageUrl != ''"> and image_url = #{ownersCommittee.imageUrl}</if>
+ <if test="ownersCommittee.latitude != null and ownersCommittee.latitude != ''"> and latitude = #{ownersCommittee.latitude}</if>
+ <if test="ownersCommittee.longitude != null and ownersCommittee.longitude != ''"> and longitude = #{ownersCommittee.longitude}</if>
+ <if test="ownersCommittee.location != null and ownersCommittee.location != ''"> and location = #{ownersCommittee.location}</if>
+ <if test="ownersCommittee.mobile != null and ownersCommittee.mobile != ''"> and mobile = #{ownersCommittee.mobile}</if>
+ <if test="ownersCommittee.name != null and ownersCommittee.name != ''"> and name = #{ownersCommittee.name}</if>
+ <if test="ownersCommittee.peopleTotal != null and ownersCommittee.peopleTotal != ''"> and people_total = #{ownersCommittee.peopleTotal}</if>
+ <if test="ownersCommittee.principalId != null "> and principal_id = #{ownersCommittee.principalId}</if>
+ <if test="ownersCommittee.principalName != null and ownersCommittee.principalName != ''"> and principal_name = #{ownersCommittee.principalName}</if>
+ <if test="ownersCommittee.profile != null and ownersCommittee.profile != ''"> and profile = #{ownersCommittee.profile}</if>
+ <if test="ownersCommittee.session != null "> and session = #{ownersCommittee.session}</if>
+ <if test="ownersCommittee.startTime != null "> and start_time = #{ownersCommittee.startTime}</if>
+ <if test="ownersCommittee.endTime != null "> and end_time = #{ownersCommittee.endTime}</if>
+ <if test="ownersCommittee.sort != null "> and sort = #{ownersCommittee.sort}</if>
+ <if test="ownersCommittee.status != null "> and status = #{ownersCommittee.status}</if>
+ <if test="ownersCommittee.type != null "> and type = #{ownersCommittee.type}</if>
+ <if test="ownersCommittee.createId != null "> and create_id = #{ownersCommittee.createId}</if>
+ <if test="ownersCommittee.updateId != null "> and update_id = #{ownersCommittee.updateId}</if>
+ <if test="ownersCommittee.createTime != null "> and create_time = #{ownersCommittee.createTime}</if>
+ <if test="ownersCommittee.updateTime != null "> and update_time = #{ownersCommittee.updateTime}</if>
+ <if test="ownersCommittee.deleteFlag != null "> and delete_flag = #{ownersCommittee.deleteFlag}</if>
+ </where>
+ </select>
+
+
+ <resultMap type="org.springblade.modules.ownersCommittee.dto.OwnersCommitteeDTO" id="OwnersCommitteeDTOResult">
+ <result property="id" column="id" />
+ <result property="areaId" column="area_id" />
+ <result property="areaName" column="area_name" />
+ <result property="establishTime" column="establish_time" />
+ <result property="imageUrl" column="image_url" />
+ <result property="latitude" column="latitude" />
+ <result property="longitude" column="longitude" />
+ <result property="location" column="location" />
+ <result property="mobile" column="mobile" />
+ <result property="name" column="name" />
+ <result property="peopleTotal" column="people_total" />
+ <result property="principalId" column="principal_id" />
+ <result property="principalName" column="principal_name" />
+ <result property="profile" column="profile" />
+ <result property="session" column="session" />
+ <result property="startTime" column="start_time" />
+ <result property="endTime" column="end_time" />
+ <result property="sort" column="sort" />
+ <result property="status" column="status" />
+ <result property="type" column="type" />
+ <result property="createId" column="create_id" />
+ <result property="updateId" column="update_id" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="deleteFlag" column="delete_flag" />
+ </resultMap>
+
+ <sql id="selectOwnersCommittee">
+ select
+ id,
+ area_id,
+ area_name,
+ establish_time,
+ image_url,
+ latitude,
+ longitude,
+ location,
+ mobile,
+ name,
+ people_total,
+ principal_id,
+ principal_name,
+ profile,
+ session,
+ start_time,
+ end_time,
+ sort,
+ status,
+ type,
+ create_id,
+ update_id,
+ create_time,
+ update_time,
+ delete_flag
+ from
+ jczz_owners_committee
+ </sql>
+
+ <select id="selectOwnersCommitteeById" parameterType="int" resultMap="OwnersCommitteeDTOResult">
+ <include refid="selectOwnersCommittee"/>
+ where
+ id = #{id}
+ </select>
+
+ <select id="selectOwnersCommitteeList" parameterType="org.springblade.modules.ownersCommittee.dto.OwnersCommitteeDTO" resultMap="OwnersCommitteeDTOResult">
+ <include refid="selectOwnersCommittee"/>
+ <where>
+ <if test="id != null "> and id = #{id}</if>
+ <if test="areaId != null "> and area_id = #{areaId}</if>
+ <if test="areaName != null and areaName != ''"> and area_name = #{areaName}</if>
+ <if test="establishTime != null "> and establish_time = #{establishTime}</if>
+ <if test="imageUrl != null and imageUrl != ''"> and image_url = #{imageUrl}</if>
+ <if test="latitude != null and latitude != ''"> and latitude = #{latitude}</if>
+ <if test="longitude != null and longitude != ''"> and longitude = #{longitude}</if>
+ <if test="location != null and location != ''"> and location = #{location}</if>
+ <if test="mobile != null and mobile != ''"> and mobile = #{mobile}</if>
+ <if test="name != null and name != ''"> and name = #{name}</if>
+ <if test="peopleTotal != null and peopleTotal != ''"> and people_total = #{peopleTotal}</if>
+ <if test="principalId != null "> and principal_id = #{principalId}</if>
+ <if test="principalName != null and principalName != ''"> and principal_name = #{principalName}</if>
+ <if test="profile != null and profile != ''"> and profile = #{profile}</if>
+ <if test="session != null "> and session = #{session}</if>
+ <if test="startTime != null "> and start_time = #{startTime}</if>
+ <if test="endTime != null "> and end_time = #{endTime}</if>
+ <if test="sort != null "> and sort = #{sort}</if>
+ <if test="status != null "> and status = #{status}</if>
+ <if test="type != null "> and type = #{type}</if>
+ <if test="createId != null "> and create_id = #{createId}</if>
+ <if test="updateId != null "> and update_id = #{updateId}</if>
+ <if test="createTime != null "> and create_time = #{createTime}</if>
+ <if test="updateTime != null "> and update_time = #{updateTime}</if>
+ <if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if>
+ </where>
+ </select>
+
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.java b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.java
new file mode 100644
index 0000000..2c8bb27
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.mapper;
+
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springblade.modules.ownersCommittee.dto.OwnersCommitteeMemberDTO;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeMemberVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 业委会成员表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+public interface OwnersCommitteeMemberMapper extends BaseMapper<OwnersCommitteeMemberEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param ownersCommittee
+ * @return
+ */
+ List<OwnersCommitteeMemberVO> selectOwnersCommitteeMemberPage(IPage page, @Param("ownersCommittee") OwnersCommitteeMemberVO ownersCommittee);
+
+ /**
+ * 查询业委会成员表
+ *
+ * @param id 业委会成员表ID
+ * @return 业委会成员表
+ */
+ public OwnersCommitteeMemberDTO selectOwnersCommitteeMemberById(Integer id);
+
+ /**
+ * 查询业委会成员表列表
+ *
+ * @param ownersCommitteeMemberDTO 业委会成员表
+ * @return 业委会成员表集合
+ */
+ public List<OwnersCommitteeMemberDTO> selectOwnersCommitteeMemberList(OwnersCommitteeMemberDTO ownersCommitteeMemberDTO);
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.xml b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.xml
new file mode 100644
index 0000000..4ad9c23
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/mapper/OwnersCommitteeMemberMapper.xml
@@ -0,0 +1,131 @@
+<?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="org.springblade.modules.ownersCommittee.mapper.OwnersCommitteeMemberMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="ownersCommitteeResultMap"
+ type="org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity">
+ </resultMap>
+
+
+ <select id="selectOwnersCommitteeMemberPage" resultMap="ownersCommitteeResultMap">
+ <include refid="selectOwnersCommitteeMember"/>
+ <where>
+ <if test="ownersCommittee.id != null ">and id = #{ownersCommittee.id}</if>
+ <if test="ownersCommittee.areaId != null ">and area_id = #{ownersCommittee.areaId}</if>
+ <if test="ownersCommittee.createId != null ">and create_id = #{ownersCommittee.createId}</if>
+ <if test="ownersCommittee.education != null and ownersCommittee.education != ''">and education = #{ownersCommittee.education}</if>
+ <if test="ownersCommittee.identityNum != null ">and identity_num = #{ownersCommittee.identityNum}</if>
+ <if test="ownersCommittee.identityType != null ">and identity_type = #{ownersCommittee.identityType}</if>
+ <if test="ownersCommittee.imageUrl != null and ownersCommittee.imageUrl != ''">and image_url = #{ownersCommittee.imageUrl}</if>
+ <if test="ownersCommittee.joinTime != null ">and join_time = #{ownersCommittee.joinTime}</if>
+ <if test="ownersCommittee.mobile != null and ownersCommittee.mobile != ''">and mobile = #{ownersCommittee.mobile}</if>
+ <if test="ownersCommittee.name != null and ownersCommittee.name != ''">and name = #{ownersCommittee.name}</if>
+ <if test="ownersCommittee.ownersCommitteeName != null and ownersCommittee.ownersCommitteeName != ''">and owners_committee_name =
+ #{ownersCommittee.ownersCommitteeName}
+ </if>
+ <if test="ownersCommittee.ownersId != null ">and owners_id = #{ownersCommittee.ownersId}</if>
+ <if test="ownersCommittee.politicalStatus != null and ownersCommittee.politicalStatus != ''">and political_status = #{ownersCommittee.politicalStatus}</if>
+ <if test="ownersCommittee.post != null and ownersCommittee.post != ''">and post = #{ownersCommittee.post}</if>
+ <if test="ownersCommittee.profile != null and ownersCommittee.profile != ''">and profile = #{ownersCommittee.profile}</if>
+ <if test="ownersCommittee.sex != null and ownersCommittee.sex != ''">and sex = #{ownersCommittee.sex}</if>
+ <if test="ownersCommittee.sort != null ">and sort = #{ownersCommittee.sort}</if>
+ <if test="ownersCommittee.status != null ">and status = #{ownersCommittee.status}</if>
+ <if test="ownersCommittee.updateId != null ">and update_id = #{ownersCommittee.updateId}</if>
+ <if test="ownersCommittee.updateTime != null ">and update_time = #{ownersCommittee.updateTime}</if>
+ <if test="ownersCommittee.createTime != null ">and create_time = #{ownersCommittee.createTime}</if>
+ <if test="ownersCommittee.deleteFlag != null ">and delete_flag = #{ownersCommittee.deleteFlag}</if>
+ </where>
+ </select>
+
+ <resultMap type="org.springblade.modules.ownersCommittee.dto.OwnersCommitteeMemberDTO"
+ id="OwnersCommitteeMemberDTOResult">
+ <result property="id" column="id"/>
+ <result property="areaId" column="area_id"/>
+ <result property="createId" column="create_id"/>
+ <result property="education" column="education"/>
+ <result property="identityNum" column="identity_num"/>
+ <result property="identityType" column="identity_type"/>
+ <result property="imageUrl" column="image_url"/>
+ <result property="joinTime" column="join_time"/>
+ <result property="mobile" column="mobile"/>
+ <result property="name" column="name"/>
+ <result property="ownersCommitteeName" column="owners_committee_name"/>
+ <result property="ownersId" column="owners_id"/>
+ <result property="politicalStatus" column="political_status"/>
+ <result property="post" column="post"/>
+ <result property="profile" column="profile"/>
+ <result property="sex" column="sex"/>
+ <result property="sort" column="sort"/>
+ <result property="status" column="status"/>
+ <result property="updateId" column="update_id"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createTime" column="create_time"/>
+ <result property="deleteFlag" column="delete_flag"/>
+ </resultMap>
+
+ <sql id="selectOwnersCommitteeMember">
+ select id,
+ area_id,
+ create_id,
+ education,
+ identity_num,
+ identity_type,
+ image_url,
+ join_time,
+ mobile,
+ name,
+ owners_committee_name,
+ owners_id,
+ political_status,
+ post,
+ profile,
+ sex,
+ sort,
+ status,
+ update_id,
+ update_time,
+ create_time,
+ delete_flag
+ from jczz_owners_committee_member
+ </sql>
+
+ <select id="selectOwnersCommitteeMemberById" parameterType="int" resultMap="OwnersCommitteeMemberDTOResult">
+ <include refid="selectOwnersCommitteeMember"/>
+ where
+ id = #{id}
+ </select>
+
+ <select id="selectOwnersCommitteeMemberList"
+ parameterType="org.springblade.modules.ownersCommittee.dto.OwnersCommitteeMemberDTO"
+ resultMap="OwnersCommitteeMemberDTOResult">
+ <include refid="selectOwnersCommitteeMember"/>
+ <where>
+ <if test="id != null ">and id = #{id}</if>
+ <if test="areaId != null ">and area_id = #{areaId}</if>
+ <if test="createId != null ">and create_id = #{createId}</if>
+ <if test="education != null and education != ''">and education = #{education}</if>
+ <if test="identityNum != null ">and identity_num = #{identityNum}</if>
+ <if test="identityType != null ">and identity_type = #{identityType}</if>
+ <if test="imageUrl != null and imageUrl != ''">and image_url = #{imageUrl}</if>
+ <if test="joinTime != null ">and join_time = #{joinTime}</if>
+ <if test="mobile != null and mobile != ''">and mobile = #{mobile}</if>
+ <if test="name != null and name != ''">and name = #{name}</if>
+ <if test="ownersCommitteeName != null and ownersCommitteeName != ''">and owners_committee_name =
+ #{ownersCommitteeName}
+ </if>
+ <if test="ownersId != null ">and owners_id = #{ownersId}</if>
+ <if test="politicalStatus != null and politicalStatus != ''">and political_status = #{politicalStatus}</if>
+ <if test="post != null and post != ''">and post = #{post}</if>
+ <if test="profile != null and profile != ''">and profile = #{profile}</if>
+ <if test="sex != null and sex != ''">and sex = #{sex}</if>
+ <if test="sort != null ">and sort = #{sort}</if>
+ <if test="status != null ">and status = #{status}</if>
+ <if test="updateId != null ">and update_id = #{updateId}</if>
+ <if test="updateTime != null ">and update_time = #{updateTime}</if>
+ <if test="createTime != null ">and create_time = #{createTime}</if>
+ <if test="deleteFlag != null ">and delete_flag = #{deleteFlag}</if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeMemberService.java b/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeMemberService.java
new file mode 100644
index 0000000..419abf1
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeMemberService.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.ownersCommittee.dto.OwnersCommitteeMemberDTO;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeMemberVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 业委会成员表 服务类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+public interface IOwnersCommitteeMemberService extends IService<OwnersCommitteeMemberEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param ownersCommittee
+ * @return
+ */
+ IPage<OwnersCommitteeMemberVO> selectOwnersCommitteeMemberPage(IPage<OwnersCommitteeMemberVO> page, OwnersCommitteeMemberVO ownersCommittee);
+
+ /**
+ * 查询业委会成员表
+ *
+ * @param id 业委会成员表ID
+ * @return 业委会成员表
+ */
+ public OwnersCommitteeMemberDTO selectOwnersCommitteeMemberById(Integer id);
+
+ /**
+ * 查询业委会成员表列表
+ *
+ * @param ownersCommitteeMemberDTO 业委会成员表
+ * @return 业委会成员表集合
+ */
+ public List<OwnersCommitteeMemberDTO> selectOwnersCommitteeMemberList(OwnersCommitteeMemberDTO ownersCommitteeMemberDTO);
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java b/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java
new file mode 100644
index 0000000..e59fe20
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/service/IOwnersCommitteeService.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.ownersCommittee.dto.OwnersCommitteeDTO;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 业委会表 服务类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+public interface IOwnersCommitteeService extends IService<OwnersCommitteeEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param ownersCommittee
+ * @return
+ */
+ IPage<OwnersCommitteeVO> selectOwnersCommitteePage(IPage<OwnersCommitteeVO> page, OwnersCommitteeVO ownersCommittee);
+
+ /**
+ * 查询业委会表
+ *
+ * @param id 业委会表ID
+ * @return 业委会表
+ */
+ public OwnersCommitteeDTO selectOwnersCommitteeById(Integer id);
+
+ /**
+ * 查询业委会表列表
+ *
+ * @param ownersCommitteeDTO 业委会表
+ * @return 业委会表集合
+ */
+ public List<OwnersCommitteeDTO> selectOwnersCommitteeList(OwnersCommitteeDTO ownersCommitteeDTO);
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeMemberServiceImpl.java b/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeMemberServiceImpl.java
new file mode 100644
index 0000000..5e9e4dd
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeMemberServiceImpl.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.ownersCommittee.dto.OwnersCommitteeMemberDTO;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeMemberVO;
+import org.springblade.modules.ownersCommittee.mapper.OwnersCommitteeMemberMapper;
+import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeMemberService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 业委会成员表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@Service
+public class OwnersCommitteeMemberServiceImpl extends ServiceImpl<OwnersCommitteeMemberMapper, OwnersCommitteeMemberEntity> implements IOwnersCommitteeMemberService {
+
+ @Override
+ public IPage<OwnersCommitteeMemberVO> selectOwnersCommitteeMemberPage(IPage<OwnersCommitteeMemberVO> page, OwnersCommitteeMemberVO ownersCommittee) {
+ return page.setRecords(baseMapper.selectOwnersCommitteeMemberPage(page, ownersCommittee));
+ }
+
+ /**
+ * 查询业委会成员表
+ *
+ * @param id 业委会成员表ID
+ * @return 业委会成员表
+ */
+ @Override
+ public OwnersCommitteeMemberDTO selectOwnersCommitteeMemberById(Integer id)
+ {
+ return this.baseMapper.selectOwnersCommitteeMemberById(id);
+ }
+
+ /**
+ * 查询业委会成员表列表
+ *
+ * @param ownersCommitteeMemberDTO 业委会成员表
+ * @return 业委会成员表集合
+ */
+ @Override
+ public List<OwnersCommitteeMemberDTO> selectOwnersCommitteeMemberList(OwnersCommitteeMemberDTO ownersCommitteeMemberDTO)
+ {
+ return this.baseMapper.selectOwnersCommitteeMemberList(ownersCommitteeMemberDTO);
+ }
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java b/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java
new file mode 100644
index 0000000..98fe896
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.ownersCommittee.dto.OwnersCommitteeDTO;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeVO;
+import org.springblade.modules.ownersCommittee.mapper.OwnersCommitteeMapper;
+import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 业委会表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@Service
+public class OwnersCommitteeServiceImpl extends ServiceImpl<OwnersCommitteeMapper, OwnersCommitteeEntity> implements IOwnersCommitteeService {
+
+ @Override
+ public IPage<OwnersCommitteeVO> selectOwnersCommitteePage(IPage<OwnersCommitteeVO> page, OwnersCommitteeVO ownersCommittee) {
+ return page.setRecords(baseMapper.selectOwnersCommitteePage(page, ownersCommittee));
+ }
+
+ /**
+ * 查询业委会表
+ *
+ * @param id 业委会表ID
+ * @return 业委会表
+ */
+ @Override
+ public OwnersCommitteeDTO selectOwnersCommitteeById(Integer id)
+ {
+ return this.baseMapper.selectOwnersCommitteeById(id);
+ }
+
+ /**
+ * 查询业委会表列表
+ *
+ * @param ownersCommitteeDTO 业委会表
+ * @return 业委会表集合
+ */
+ @Override
+ public List<OwnersCommitteeDTO> selectOwnersCommitteeList(OwnersCommitteeDTO ownersCommitteeDTO)
+ {
+ return this.baseMapper.selectOwnersCommitteeList(ownersCommitteeDTO);
+ }
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeMemberVO.java b/src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeMemberVO.java
new file mode 100644
index 0000000..d6ef6d6
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeMemberVO.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.vo;
+
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 业委会成员表 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OwnersCommitteeMemberVO extends OwnersCommitteeMemberEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeVO.java b/src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeVO.java
new file mode 100644
index 0000000..f7b2a85
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/vo/OwnersCommitteeVO.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.vo;
+
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 业委会表 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OwnersCommitteeVO extends OwnersCommitteeEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeMemberWrapper.java b/src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeMemberWrapper.java
new file mode 100644
index 0000000..1927e5f
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeMemberWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeMemberVO;
+import java.util.Objects;
+
+/**
+ * 业委会成员表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+public class OwnersCommitteeMemberWrapper extends BaseEntityWrapper<OwnersCommitteeMemberEntity, OwnersCommitteeMemberVO> {
+
+ public static OwnersCommitteeMemberWrapper build() {
+ return new OwnersCommitteeMemberWrapper();
+ }
+
+ @Override
+ public OwnersCommitteeMemberVO entityVO(OwnersCommitteeMemberEntity ownersCommittee) {
+ OwnersCommitteeMemberVO ownersCommitteeVO = Objects.requireNonNull(BeanUtil.copy(ownersCommittee, OwnersCommitteeMemberVO.class));
+
+ //User createUser = UserCache.getUser(ownersCommittee.getCreateUser());
+ //User updateUser = UserCache.getUser(ownersCommittee.getUpdateUser());
+ //ownersCommitteeVO.setCreateUserName(createUser.getName());
+ //ownersCommitteeVO.setUpdateUserName(updateUser.getName());
+
+ return ownersCommitteeVO;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeWrapper.java b/src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeWrapper.java
new file mode 100644
index 0000000..9496ca7
--- /dev/null
+++ b/src/main/java/org/springblade/modules/ownersCommittee/wrapper/OwnersCommitteeWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.ownersCommittee.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
+import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeVO;
+import java.util.Objects;
+
+/**
+ * 业委会表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2023-12-19
+ */
+public class OwnersCommitteeWrapper extends BaseEntityWrapper<OwnersCommitteeEntity, OwnersCommitteeVO> {
+
+ public static OwnersCommitteeWrapper build() {
+ return new OwnersCommitteeWrapper();
+ }
+
+ @Override
+ public OwnersCommitteeVO entityVO(OwnersCommitteeEntity ownersCommittee) {
+ OwnersCommitteeVO ownersCommitteeVO = Objects.requireNonNull(BeanUtil.copy(ownersCommittee, OwnersCommitteeVO.class));
+
+ //User createUser = UserCache.getUser(ownersCommittee.getCreateUser());
+ //User updateUser = UserCache.getUser(ownersCommittee.getUpdateUser());
+ //ownersCommitteeVO.setCreateUserName(createUser.getName());
+ //ownersCommitteeVO.setUpdateUserName(updateUser.getName());
+
+ return ownersCommitteeVO;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 6ae4d14..0cc5984 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -123,7 +123,8 @@
@Override
public boolean updateUserInfo(User user) {
user.setPassword(null);
- return updateById(user);
+ boolean b = updateById(user);
+ return b;
}
private boolean submitUserDept(User user) {
@@ -136,7 +137,8 @@
userDeptList.add(userDept);
});
userDeptService.remove(Wrappers.<UserDept>update().lambda().eq(UserDept::getUserId, user.getId()));
- return userDeptService.saveBatch(userDeptList);
+ boolean b = userDeptService.saveBatch(userDeptList);
+ return b;
}
@Override
--
Gitblit v1.9.3