修改租户管理相关代码
main
zxf 2 weeks ago
parent 75a4bea6db
commit 0fc483c7ac

@ -81,7 +81,7 @@
</span>
<!-- 租户弹窗 -->
<tenant-add-and-update ref="tenantAddOrUpdate" :ownerId="dataForm.id" @refreshDataList="getTenantList"></tenant-add-and-update>
<tenant-add-and-update ref="tenantAddOrUpdate" :ownerId="dataForm.id" @refreshDataList="getTenantList" @saveTenant="saveTenant"></tenant-add-and-update>
</el-dialog>
</template>
@ -90,6 +90,7 @@
import * as deptApi from '@/api/sysdept.js'
import * as tenantApi from '@/api/pmtenant.js'
import * as houseApi from '@/api/pmhouse.js'
import * as rentRecordApi from '@/api/pmtenanthouse.js'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import TenantAddAndUpdate from './tenant-add-and-update.vue'
@ -120,6 +121,9 @@
ownerName: [
{ required: true, message: '业主姓名 为必填项', trigger: 'blur' }
],
deptId: [
{ required: true, message: '部门 为必填项', trigger: 'blur' }
],
ownerType: [
{ required: true, message: '业主类型 为必填项', trigger: 'blur' }
],
@ -150,6 +154,7 @@
tenantApi.pmtenantListByOwnerIdApi(this.dataForm.id, { page: 1, limit: 9999 }).then(res => {
try {
this.tenantList = Array.isArray(res) ? res : (res.list || [])
this.loadRentRecordsForTenants()
} catch (error) {
this.tenantList = []
}
@ -157,6 +162,36 @@
this.tenantList = []
})
},
//
loadRentRecordsForTenants() {
this.tenantList.forEach(tenant => {
if (tenant.id) {
rentRecordApi.pmtenanthouseListApi({ rentId: tenant.id, page: 1, limit: 9999 }).then(res => {
try {
tenant.pmTenantHouses = Array.isArray(res) ? res : (res.list || [])
} catch (error) {
tenant.pmTenantHouses = []
}
}).catch(err => {
tenant.pmTenantHouses = []
})
} else {
tenant.pmTenantHouses = []
}
})
},
//
saveTenant(tenantData) {
if (!tenantData) return
const existingIndex = this.tenantList.findIndex(tenant => tenant.id === tenantData.id)
if (existingIndex !== -1) {
this.tenantList.splice(existingIndex, 1, tenantData)
} else {
this.tenantList.push(tenantData)
}
},
//
addTenant() {
if (this.$refs.tenantAddOrUpdate) {
@ -212,8 +247,13 @@
if (this.dataForm.id) {
api.pmownerDetailApi(id).then(function(res) {
this.dataForm = res;
//
// 使
if (res.pmTenants && res.pmTenants.length > 0) {
this.tenantList = res.pmTenants
} else {
// API
this.getTenantList()
}
}.bind(this))
} else {
//
@ -225,14 +265,41 @@
dataSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
const submitData = {
id: this.dataForm.id,
ownerName: this.dataForm.ownerName,
ownerType: this.dataForm.ownerType,
ownerIdcard: this.dataForm.ownerIdcard,
phone: this.dataForm.phone,
email: this.dataForm.email,
emergencyContact: this.dataForm.emergencyContact,
emergencyPhone: this.dataForm.emergencyPhone,
status: this.dataForm.status,
deptId: this.dataForm.deptId,
houseId: this.dataForm.houseId,
remark: this.dataForm.remark,
pmTenants: this.tenantList.map(tenant => ({
id: tenant.id,
tenantName: tenant.tenantName,
tenantType: tenant.tenantType,
idCard: tenant.idCard,
phome: tenant.phome,
company: tenant.company,
status: tenant.status,
remark: tenant.remark,
tenantId: tenant.tenantId,
pmTenantHouses: tenant.pmTenantHouses || []
}))
}
if (this.dataForm.id) {
api.pmownerUpdateApi(this.dataForm).then(function(res) {
api.pmownerUpdateApi(submitData).then(function(res) {
this.$message.success('保存成功')
this.visible = false
this.$emit('refreshDataList')
}.bind(this));
} else {
api.pmownerCreateApi(this.dataForm).then(function(res) {
api.pmownerCreateApi(submitData).then(function(res) {
this.$message.success('新增成功')
this.visible = false
this.$emit('refreshDataList')

@ -4,14 +4,14 @@
:title="!dataForm.id ? '添加' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible"
:z-index="3000">
:z-index="2000">
<!-- 新增和修改表单 -->
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataSubmit()" label-width="120px">
<el-form-item label="绑定时间" prop="rentBeginTime">
<el-date-picker v-model="dataForm.rentBeginTime" type="datetime" placeholder="选择绑定时间" style="width: 100%"></el-date-picker>
<el-date-picker v-model="dataForm.rentBeginTime" type="datetime" placeholder="选择绑定时间" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%"></el-date-picker>
</el-form-item>
<el-form-item label="解绑时间" prop="rentEndTime">
<el-date-picker v-model="dataForm.rentEndTime" type="datetime" placeholder="选择解绑时间" style="width: 100%"></el-date-picker>
<el-date-picker v-model="dataForm.rentEndTime" type="datetime" placeholder="选择解绑时间" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%"></el-date-picker>
</el-form-item>
<el-form-item label="押金金额" prop="depositAmount">
<el-input-number v-model="dataForm.depositAmount" :min="0" :precision="2" placeholder="押金金额" style="width: 100%"></el-input-number>

@ -28,14 +28,13 @@
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
</el-form-item>
<!-- 显示添加租赁记录按钮 -->
<el-form-item>
<el-button type="success" @click="addRentRecord"></el-button>
</el-form-item>
</el-form>
<!-- 租赁记录列表 -->
<div class="rent-records-container">
<el-table :data="rentRecords" style="width: 100%">
@ -195,40 +194,27 @@
dataSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
if (this.dataForm.id) {
api.pmtenantUpdateApi(this.dataForm).then(() => {
this.$message.success('保存成功')
this.visible = false
this.$emit('refreshDataList')
})
} else {
api.pmtenantCreateApi(this.dataForm).then(res => {
const tenantId = res.id
if (tenantId && this.ownerId) {
const relData = {
tenantHouseId: tenantId,
ownerId: this.ownerId,
const tenantData = {
id: this.dataForm.id,
tenantName: this.dataForm.tenantName,
tenantType: this.dataForm.tenantType,
idCard: this.dataForm.idCard,
phome: this.dataForm.phome,
company: this.dataForm.company,
status: this.dataForm.status,
remark: this.dataForm.remark,
tenantId: this.dataForm.tenantId,
delFlag: '0'
pmTenantHouses: this.rentRecords
}
relApi.pmtentanthouserelCreateApi(relData).then(() => {
this.$message.success('新增成功')
this.visible = false
this.$emit('refreshDataList')
}).catch(() => {
this.$message.error('关联关系创建失败')
})
} else {
this.$message.success('新增成功')
this.$emit('saveTenant', tenantData)
this.$message.success('保存成功')
this.visible = false
this.$emit('refreshDataList')
}
})
}
}
})
}
}
}
</script>
<style>

@ -0,0 +1,309 @@
package com.zbkj.modules.autogencode.controller;
import java.util.Arrays;
import java.util.Map;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zbkj.common.model.user.User;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.page.CommonPage;
import com.zbkj.service.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
/**
*
*/
@RestController
@RequestMapping("api/autogencode/ebuser")
public class EbUserController {
@Autowired
private UserService ebUserService;
/**
*
*
*/
private void condition(LambdaQueryWrapper<User> queryWrapper, User request) {
if (request == null) {
return;
}
// 根据实体类字段自动生成查询条件
// 用户id
if (request.getUid() != null) {
queryWrapper.eq(User::getUid, request.getUid());
}
// 用户账号
if (StrUtil.isNotBlank(request.getAccount())) {
queryWrapper.eq(User::getAccount, request.getAccount());
}
// 用户密码
if (StrUtil.isNotBlank(request.getPwd())) {
queryWrapper.eq(User::getPwd, request.getPwd());
}
// 真实姓名
if (StrUtil.isNotBlank(request.getRealName())) {
queryWrapper.eq(User::getRealName, request.getRealName());
}
// 生日
if (StrUtil.isNotBlank(request.getBirthday())) {
queryWrapper.eq(User::getBirthday, request.getBirthday());
}
// 身份证号码
if (StrUtil.isNotBlank(request.getCardId())) {
queryWrapper.eq(User::getCardId, request.getCardId());
}
// 用户备注
if (StrUtil.isNotBlank(request.getMark())) {
queryWrapper.eq(User::getMark, request.getMark());
}
// 合伙人id
if (request.getPartnerId() != null) {
queryWrapper.eq(User::getPartnerId, request.getPartnerId());
}
// 用户分组id
if (StrUtil.isNotBlank(request.getGroupId())) {
queryWrapper.eq(User::getGroupId, request.getGroupId());
}
// 标签id
if (StrUtil.isNotBlank(request.getTagId())) {
queryWrapper.eq(User::getTagId, request.getTagId());
}
// 用户昵称
if (StrUtil.isNotBlank(request.getNickname())) {
queryWrapper.eq(User::getNickname, request.getNickname());
}
// 用户头像
if (StrUtil.isNotBlank(request.getAvatar())) {
queryWrapper.eq(User::getAvatar, request.getAvatar());
}
// 手机号码
if (StrUtil.isNotBlank(request.getPhone())) {
queryWrapper.eq(User::getPhone, request.getPhone());
}
// 添加ip
if (StrUtil.isNotBlank(request.getAddIp())) {
queryWrapper.eq(User::getAddIp, request.getAddIp());
}
// 最后一次登录ip
if (StrUtil.isNotBlank(request.getLastIp())) {
queryWrapper.eq(User::getLastIp, request.getLastIp());
}
// 用户余额
if (request.getNowMoney() != null) {
queryWrapper.eq(User::getNowMoney, request.getNowMoney());
}
// 佣金金额
if (request.getBrokeragePrice() != null) {
queryWrapper.eq(User::getBrokeragePrice, request.getBrokeragePrice());
}
// 用户剩余积分
if (request.getIntegral() != null) {
queryWrapper.eq(User::getIntegral, request.getIntegral());
}
// 用户剩余经验
if (request.getExperience() != null) {
queryWrapper.eq(User::getExperience, request.getExperience());
}
// 连续签到天数
if (request.getSignNum() != null) {
queryWrapper.eq(User::getSignNum, request.getSignNum());
}
// 1为正常0为禁止
if (request.getStatus() != null) {
queryWrapper.eq(User::getStatus, request.getStatus());
}
// 等级
if (request.getLevel() != null) {
queryWrapper.eq(User::getLevel, request.getLevel());
}
// 推广员id
if (request.getSpreadUid() != null) {
queryWrapper.eq(User::getSpreadUid, request.getSpreadUid());
}
// 推广员关联时间
if (request.getSpreadTime() != null) {
queryWrapper.eq(User::getSpreadTime, request.getSpreadTime());
}
// 用户类型
if (StrUtil.isNotBlank(request.getUserType())) {
queryWrapper.eq(User::getUserType, request.getUserType());
}
// 是否为推广员
if (request.getIsPromoter() != null) {
queryWrapper.eq(User::getIsPromoter, request.getIsPromoter());
}
// 用户购买次数
if (request.getPayCount() != null) {
queryWrapper.eq(User::getPayCount, request.getPayCount());
}
// 下级人数
if (request.getSpreadCount() != null) {
queryWrapper.eq(User::getSpreadCount, request.getSpreadCount());
}
// 详细地址
if (StrUtil.isNotBlank(request.getAddres())) {
queryWrapper.eq(User::getAddres, request.getAddres());
}
// 管理员编号
if (request.getAdminid() != null) {
queryWrapper.eq(User::getAdminid, request.getAdminid());
}
// 用户登陆类型h5,wechat,routine
if (StrUtil.isNotBlank(request.getLoginType())) {
queryWrapper.eq(User::getLoginType, request.getLoginType());
}
// 创建时间
if (request.getCreateTime() != null) {
queryWrapper.eq(User::getCreateTime, request.getCreateTime());
}
// 更新时间
if (request.getUpdateTime() != null) {
queryWrapper.eq(User::getUpdateTime, request.getUpdateTime());
}
// 最后一次登录时间
if (request.getLastLoginTime() != null) {
queryWrapper.eq(User::getLastLoginTime, request.getLastLoginTime());
}
// 清除时间
if (request.getCleanTime() != null) {
queryWrapper.eq(User::getCleanTime, request.getCleanTime());
}
// 推广等级记录
if (StrUtil.isNotBlank(request.getPath())) {
queryWrapper.eq(User::getPath, request.getPath());
}
// 是否关注公众号
if (request.getSubscribe() != null) {
queryWrapper.eq(User::getSubscribe, request.getSubscribe());
}
// 国家中国CN其他OTHER
if (StrUtil.isNotBlank(request.getCountry())) {
queryWrapper.eq(User::getCountry, request.getCountry());
}
// 成为分销员时间
if (request.getPromoterTime() != null) {
queryWrapper.eq(User::getPromoterTime, request.getPromoterTime());
}
}
/**
*
* @param request
* @param pageParamRequest
*/
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<User>> getList(@Validated User request, @Validated PageParamRequest pageParamRequest) {
LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper();
// 应用搜索条件
condition(queryWrapper, request);
CommonPage<User> page = CommonPage.restPage(ebUserService.pageList(queryWrapper, pageParamRequest));
return CommonResult.success(page);
}
/**
*
*/
@RequestMapping(value = "/info/{uid}", method = RequestMethod.GET)
public CommonResult<User> info(@PathVariable("uid") Integer uid){
User ebUser = ebUserService.getById(uid);
return CommonResult.success(ebUser);
}
/**
*
*/
@RequestMapping(value = "/save", method = RequestMethod.POST)
public CommonResult<String> save(@RequestBody User ebUser){
if (ebUserService.save(ebUser)) {
return CommonResult.success();
}
return CommonResult.failed();
}
/**
*
*/
@RequestMapping(value = "/update", method = RequestMethod.POST)
public CommonResult<String> update(@RequestBody User ebUser){
if (ebUserService.updateById(ebUser)) {
return CommonResult.success();
}
return CommonResult.failed();
}
/**
* :id
*/
@RequestMapping(value = "/delete", method = RequestMethod.POST)
public CommonResult<String> delete(@RequestBody Integer[] uids){
if (ebUserService.removeByIds(Arrays.asList(uids))) {
return CommonResult.success();
}
return CommonResult.failed();
}
}

@ -26,6 +26,12 @@ import com.zbkj.common.model.system.SysDept;
import com.zbkj.service.service.SysDeptService;
import com.zbkj.modules.autogencode.entity.PmOwnerHouseRel;
import com.zbkj.modules.autogencode.service.PmOwnerHouseRelService;
import com.zbkj.modules.autogencode.entity.PmTenant;
import com.zbkj.modules.autogencode.service.PmTenantService;
import com.zbkj.modules.autogencode.entity.PmTenantHouse;
import com.zbkj.modules.autogencode.service.PmTenantHouseService;
import com.zbkj.modules.autogencode.entity.PmTenantHouseRel;
import com.zbkj.modules.autogencode.service.PmTenantHouseRelService;
@ -45,6 +51,15 @@ public class PmOwnerController {
@Autowired
private PmOwnerHouseRelService pmOwnerHouseRelService;
@Autowired
private PmTenantService pmTenantService;
@Autowired
private PmTenantHouseService pmTenantHouseService;
@Autowired
private PmTenantHouseRelService pmTenantHouseRelService;
/**
@ -228,7 +243,6 @@ public class PmOwnerController {
public CommonResult<PmOwner> info(@PathVariable("id") Long id){
PmOwner pmOwner = pmOwnerService.getById(id);
// 查询业主房屋关联关系
if (pmOwner != null) {
LambdaQueryWrapper<PmOwnerHouseRel> relQueryWrapper = new LambdaQueryWrapper<>();
relQueryWrapper.eq(PmOwnerHouseRel::getOwnerId, id);
@ -237,6 +251,25 @@ public class PmOwnerController {
if (rels != null && !rels.isEmpty()) {
pmOwner.setHouseId(rels.get(0).getHouseId());
}
LambdaQueryWrapper<PmTenantHouseRel> tenantRelQueryWrapper = new LambdaQueryWrapper<>();
tenantRelQueryWrapper.eq(PmTenantHouseRel::getOwnerId, id);
List<PmTenantHouseRel> tenantRels = pmTenantHouseRelService.list(tenantRelQueryWrapper);
if (tenantRels != null && !tenantRels.isEmpty()) {
List<PmTenant> tenantList = new ArrayList<>();
for (PmTenantHouseRel tenantRel : tenantRels) {
PmTenant tenant = pmTenantService.getById(tenantRel.getTenantHouseId());
if (tenant != null) {
LambdaQueryWrapper<PmTenantHouse> houseQueryWrapper = new LambdaQueryWrapper<>();
houseQueryWrapper.eq(PmTenantHouse::getRentId, tenant.getId());
List<PmTenantHouse> tenantHouses = pmTenantHouseService.list(houseQueryWrapper);
tenant.setPmTenantHouses(tenantHouses);
tenantList.add(tenant);
}
}
pmOwner.setPmTenants(tenantList);
}
}
return CommonResult.success(pmOwner);
@ -248,15 +281,38 @@ public class PmOwnerController {
@RequestMapping(value = "/save", method = RequestMethod.POST)
public CommonResult<String> save(@RequestBody PmOwner pmOwner){
if (pmOwnerService.save(pmOwner)) {
// 如果选择了房屋,创建业主房屋关联关系
Long ownerId = pmOwner.getId();
if (pmOwner.getHouseId() != null) {
PmOwnerHouseRel rel = new PmOwnerHouseRel();
rel.setOwnerId(pmOwner.getId());
rel.setOwnerId(ownerId);
rel.setHouseId(pmOwner.getHouseId());
rel.setRelType("1");
rel.setBindTime(new java.util.Date());
pmOwnerHouseRelService.save(rel);
}
if (pmOwner.getPmTenants() != null && !pmOwner.getPmTenants().isEmpty()) {
for (PmTenant tenant : pmOwner.getPmTenants()) {
if (pmTenantService.save(tenant)) {
Long tenantId = tenant.getId();
PmTenantHouseRel tenantHouseRel = new PmTenantHouseRel();
tenantHouseRel.setTenantHouseId(tenantId);
tenantHouseRel.setOwnerId(ownerId);
tenantHouseRel.setTenantId(tenant.getTenantId());
tenantHouseRel.setDelFlag("0");
pmTenantHouseRelService.save(tenantHouseRel);
if (tenant.getPmTenantHouses() != null && !tenant.getPmTenantHouses().isEmpty()) {
for (PmTenantHouse tenantHouse : tenant.getPmTenantHouses()) {
tenantHouse.setRentId(tenantId);
pmTenantHouseService.save(tenantHouse);
}
}
}
}
}
return CommonResult.success();
}
return CommonResult.failed();
@ -268,35 +324,80 @@ public class PmOwnerController {
@RequestMapping(value = "/update", method = RequestMethod.POST)
public CommonResult<String> update(@RequestBody PmOwner pmOwner){
if (pmOwnerService.updateById(pmOwner)) {
// 处理业主房屋关联关系
Long ownerId = pmOwner.getId();
LambdaQueryWrapper<PmOwnerHouseRel> relQueryWrapper = new LambdaQueryWrapper<>();
relQueryWrapper.eq(PmOwnerHouseRel::getOwnerId, pmOwner.getId());
relQueryWrapper.eq(PmOwnerHouseRel::getOwnerId, ownerId);
List<PmOwnerHouseRel> existingRels = pmOwnerHouseRelService.list(relQueryWrapper);
if (pmOwner.getHouseId() != null) {
// 如果选择了房屋
if (existingRels != null && !existingRels.isEmpty()) {
// 更新现有的关联关系
PmOwnerHouseRel existingRel = existingRels.get(0);
existingRel.setHouseId(pmOwner.getHouseId());
existingRel.setRelType("1");
existingRel.setBindTime(new java.util.Date());
pmOwnerHouseRelService.updateById(existingRel);
} else {
// 创建新的关联关系
PmOwnerHouseRel rel = new PmOwnerHouseRel();
rel.setOwnerId(pmOwner.getId());
rel.setOwnerId(ownerId);
rel.setHouseId(pmOwner.getHouseId());
rel.setRelType("1");
rel.setBindTime(new java.util.Date());
pmOwnerHouseRelService.save(rel);
}
} else {
// 如果没有选择房屋,删除现有的关联关系
if (existingRels != null && !existingRels.isEmpty()) {
pmOwnerHouseRelService.removeByIds(existingRels.stream().map(PmOwnerHouseRel::getId).collect(java.util.stream.Collectors.toList()));
}
}
if (pmOwner.getPmTenants() != null && !pmOwner.getPmTenants().isEmpty()) {
for (PmTenant tenant : pmOwner.getPmTenants()) {
if (tenant.getId() != null) {
pmTenantService.updateById(tenant);
} else {
pmTenantService.save(tenant);
}
Long tenantId = tenant.getId();
LambdaQueryWrapper<PmTenantHouseRel> tenantRelQueryWrapper = new LambdaQueryWrapper<>();
tenantRelQueryWrapper.eq(PmTenantHouseRel::getTenantHouseId, tenantId);
tenantRelQueryWrapper.eq(PmTenantHouseRel::getOwnerId, ownerId);
List<PmTenantHouseRel> existingTenantRels = pmTenantHouseRelService.list(tenantRelQueryWrapper);
if (existingTenantRels == null || existingTenantRels.isEmpty()) {
PmTenantHouseRel tenantHouseRel = new PmTenantHouseRel();
tenantHouseRel.setTenantHouseId(tenantId);
tenantHouseRel.setOwnerId(ownerId);
tenantHouseRel.setTenantId(tenant.getTenantId());
tenantHouseRel.setDelFlag("0");
pmTenantHouseRelService.save(tenantHouseRel);
}
if (tenant.getPmTenantHouses() != null && !tenant.getPmTenantHouses().isEmpty()) {
for (PmTenantHouse tenantHouse : tenant.getPmTenantHouses()) {
if (tenantHouse.getId() != null) {
PmTenantHouse existingHouse = pmTenantHouseService.getById(tenantHouse.getId());
if (existingHouse != null) {
existingHouse.setRentId(tenantId);
existingHouse.setRentBeginTime(tenantHouse.getRentBeginTime());
existingHouse.setRentEndTime(tenantHouse.getRentEndTime());
existingHouse.setDepositAmount(tenantHouse.getDepositAmount());
existingHouse.setRentAmount(tenantHouse.getRentAmount());
existingHouse.setAuthScope(tenantHouse.getAuthScope());
existingHouse.setStatus(tenantHouse.getStatus());
existingHouse.setRemark(tenantHouse.getRemark());
pmTenantHouseService.updateById(existingHouse);
}
} else {
tenantHouse.setRentId(tenantId);
pmTenantHouseService.save(tenantHouse);
}
}
}
}
}
return CommonResult.success();
}
return CommonResult.failed();

@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zbkj.modules.autogencode.entity.PmTenant;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import lombok.Data;
@ -116,4 +118,11 @@ public class PmOwner implements Serializable {
@ApiModelProperty(value = "租户ID")
private String tenantId;
/**
*
*/
@TableField(exist = false)
@ApiModelProperty(value = "租户列表")
private List<PmTenant> pmTenants;
}

@ -1,12 +1,15 @@
package com.zbkj.modules.autogencode.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zbkj.modules.autogencode.entity.PmTenantHouse;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import lombok.Data;
@ -92,4 +95,11 @@ public class PmTenant implements Serializable {
@ApiModelProperty(value = "租户ID")
private String tenantId;
/**
*
*/
@TableField(exist = false)
@ApiModelProperty(value = "租赁记录列表")
private List<PmTenantHouse> pmTenantHouses;
}

@ -3,11 +3,13 @@ package com.zbkj.modules.autogencode.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
@ -30,11 +32,13 @@ public class PmTenantHouse implements Serializable {
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
@ApiModelProperty(value = "绑定时间")
private Date rentBeginTime;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
@ApiModelProperty(value = "解绑时间")
private Date rentEndTime;
/**
@ -98,4 +102,5 @@ public class PmTenantHouse implements Serializable {
@ApiModelProperty(value = "租户ID")
private String tenantId;
}

@ -156,4 +156,12 @@ public class User implements Serializable {
@ApiModelProperty(value = "成为分销员时间")
private Date promoterTime;
@ApiModelProperty(value = "员工类型")
private String staffType;
@ApiModelProperty(value = "业主/租户Id")
private Long ownerTenantId;
}

@ -1,5 +1,6 @@
package com.zbkj.service.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.zbkj.common.model.user.User;
@ -25,6 +26,13 @@ import java.util.Map;
*/
public interface UserService extends IService<User> {
/**
* EbUser
* @param pageParamRequest
* @return
*/
List<User> pageList(LambdaQueryWrapper<User> queryWrapper, PageParamRequest pageParamRequest);
/**
*
* @param request

@ -123,6 +123,18 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
@Autowired
private SystemAttachmentService systemAttachmentService;
/**
*
*/
@Override
public List<User> pageList(LambdaQueryWrapper<User> queryWrapper, PageParamRequest pageParamRequest) {
PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
return userDao.selectList(queryWrapper);
}
/**
*
*

Loading…
Cancel
Save