From 33a9f557a2e00bac9f6a17f40623ef18ae147e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Tue, 10 Jun 2025 16:47:31 +0800 Subject: [PATCH] =?UTF-8?q?1.BUG=E4=BF=AE=E5=A4=8D=E3=80=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/WxCarportController.java | 16 ++++ .../business/api/ApiWxCarportController.java | 59 +++++++++++++ .../api/ApiWxPayRecordController.java | 2 +- .../api/ApiWxSlideshowController.java | 3 +- .../business/domain/WxSlideshow.java | 4 + .../business/domain/bo/WxClockBo.java | 2 + .../business/domain/bo/WxGuestBo.java | 14 ++- .../business/domain/bo/WxLiveBillBo.java | 3 +- .../business/domain/bo/WxSlideshowBo.java | 5 ++ .../business/domain/vo/WxLiveBillVo.java | 10 +++ .../business/domain/vo/WxSlideshowVo.java | 5 ++ .../service/impl/WxCarportServiceImpl.java | 1 + .../service/impl/WxClockServiceImpl.java | 1 + .../impl/WxFamilyMemberServiceImpl.java | 2 + .../service/impl/WxGuestServiceImpl.java | 1 + .../service/impl/WxLiveBillServiceImpl.java | 14 ++- .../service/impl/WxRepairsServiceImpl.java | 10 +++ .../src/api/business/carport.js | 9 ++ .../src/views/business/account/index.vue | 8 +- .../src/views/business/carport/index.vue | 2 +- .../src/views/business/comment/index.vue | 17 ++-- .../src/views/business/guest/index.vue | 30 +++++-- .../src/views/business/liveBill/index.vue | 86 ++++++++++++++++--- .../src/views/business/payRecord/index.vue | 4 +- .../views/business/proprietorLedger/index.vue | 6 +- .../src/views/business/repairs/index.vue | 8 +- .../src/views/business/rule/index.vue | 70 ++++++++------- .../src/views/business/slideshow/index.vue | 23 ++++- .../src/views/business/user/index.vue | 10 +-- .../src/views/system/user/index.vue | 14 +-- 30 files changed, 348 insertions(+), 91 deletions(-) create mode 100644 propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxCarportController.java diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java index e3d82b1..b12d25d 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java @@ -5,9 +5,12 @@ import com.propertyManagement.business.domain.bo.WxCarportBo; import com.propertyManagement.business.domain.bo.WxProprietorLedgerBo; import com.propertyManagement.business.domain.vo.WxCarportVo; import com.propertyManagement.business.domain.vo.WxProprietorLedgerVo; +import com.propertyManagement.business.domain.vo.WxProtocolVo; import com.propertyManagement.business.listener.WxCarportImportListener; import com.propertyManagement.business.listener.WxProprietorLedgerImportListener; import com.propertyManagement.business.service.IWxCarportService; +import com.propertyManagement.business.service.IWxProprietorLedgerService; +import com.propertyManagement.business.service.IWxProtocolService; import com.propertyManagement.common.annotation.Log; import com.propertyManagement.common.annotation.RepeatSubmit; import com.propertyManagement.common.core.controller.BaseController; @@ -45,6 +48,7 @@ import java.util.List; public class WxCarportController extends BaseController { private final IWxCarportService iWxCarportService; + private final IWxProprietorLedgerService proprietorLedgerService; /** * 查询业主车位列表 @@ -55,6 +59,18 @@ public class WxCarportController extends BaseController { return iWxCarportService.queryPageList(bo, pageQuery); } + /** + * 查询业主车位列表 + */ + @GetMapping("/listAll") + public R> listAll(WxCarportBo bo) { + if (bo.getProprietorId() != null) { + WxProprietorLedgerVo proprietorLedgerVo = proprietorLedgerService.queryById(bo.getProprietorId()); + bo.setCommunityId(proprietorLedgerVo.getCommunityId()); + } + return R.ok(iWxCarportService.queryList(bo)); + } + /** * 导出业主车位列表 */ diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxCarportController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxCarportController.java new file mode 100644 index 0000000..dbed335 --- /dev/null +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxCarportController.java @@ -0,0 +1,59 @@ +package com.propertyManagement.web.controller.business.api; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.propertyManagement.business.domain.bo.WxCarportBo; +import com.propertyManagement.business.domain.bo.WxProprietorLedgerBo; +import com.propertyManagement.business.domain.vo.WxCarportVo; +import com.propertyManagement.business.listener.WxCarportImportListener; +import com.propertyManagement.business.service.IWxCarportService; +import com.propertyManagement.business.support.util.AuthUtil; +import com.propertyManagement.common.annotation.Log; +import com.propertyManagement.common.annotation.RepeatSubmit; +import com.propertyManagement.common.core.controller.BaseController; +import com.propertyManagement.common.core.domain.PageQuery; +import com.propertyManagement.common.core.domain.R; +import com.propertyManagement.common.core.page.TableDataInfo; +import com.propertyManagement.common.core.validate.AddGroup; +import com.propertyManagement.common.core.validate.EditGroup; +import com.propertyManagement.common.enums.BusinessType; +import com.propertyManagement.common.excel.ExcelResult; +import com.propertyManagement.common.utils.poi.ExcelUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 业主车位 + * + * @author liushuai + * @date 2025-05-26 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/api/carport") +public class ApiWxCarportController extends BaseController { + + private final IWxCarportService iWxCarportService; + + /** + * 查询业主车位列表 + */ + @GetMapping("/listByType") + public R> list(@Validated @NotNull(message = "车位类型不能为空") Integer type) { + WxCarportBo wxCarportBo = new WxCarportBo(); + wxCarportBo.setType(type); + wxCarportBo.setProprietorId(AuthUtil.getWxUser().getProprietorId()); + return R.ok(iWxCarportService.queryList(wxCarportBo)); + } + +} diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxPayRecordController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxPayRecordController.java index 6568849..ba4309c 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxPayRecordController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxPayRecordController.java @@ -45,7 +45,7 @@ public class ApiWxPayRecordController extends BaseController { WxPayRecordBo recordBo = new WxPayRecordBo(); recordBo.setProprietorId(AuthUtil.getWxUser().getProprietorId()); recordBo.setOrderType(type); -// recordBo.setPayState(PayState.NO.getCode()); + recordBo.setPayState(PayState.YES.getCode()); return R.ok(iWxPayRecordService.queryList(recordBo)); } diff --git a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxSlideshowController.java b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxSlideshowController.java index 92ce234..95c1c0b 100644 --- a/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxSlideshowController.java +++ b/propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxSlideshowController.java @@ -44,9 +44,10 @@ public class ApiWxSlideshowController extends BaseController { * 查询轮播图列表 */ @GetMapping("/list") - public R> listAll() { + public R> listAll(@Validated @NotNull(message = "类型不能为空") Integer type) { WxSlideshowBo wxSlideshowBo = new WxSlideshowBo(); wxSlideshowBo.setIsEnable(IsEnableType.YES.getCode()); + wxSlideshowBo.setType(type); return R.ok(iWxSlideshowService.queryList(wxSlideshowBo)); } } diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/WxSlideshow.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/WxSlideshow.java index 5397145..fc920d9 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/WxSlideshow.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/WxSlideshow.java @@ -36,6 +36,10 @@ public class WxSlideshow extends BaseEntity { * 跳转地址 */ private String skipUrl; + /** + * 类型（1首页轮播图 2个人中心轮播图） + */ + private Integer type; /** * 是否启用（0否 1是） */ diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxClockBo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxClockBo.java index 3930d0c..064a25c 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxClockBo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxClockBo.java @@ -69,11 +69,13 @@ public class WxClockBo extends BaseEntity { /** * 打卡时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date clockStartTime; /** * 打卡时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date clockEndTime; /** diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxGuestBo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxGuestBo.java index b2b2eab..7e67061 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxGuestBo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxGuestBo.java @@ -43,9 +43,21 @@ public class WxGuestBo extends BaseEntity { /** * 到访时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date guestTime; + /** + * 到访时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date guestStartTime; + + /** + * 到访时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date guestEndTime; + /** * 访客手机 */ diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxLiveBillBo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxLiveBillBo.java index 9059f6f..4f4c606 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxLiveBillBo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxLiveBillBo.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.propertyManagement.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -98,7 +99,7 @@ public class WxLiveBillBo extends BaseEntity { /** * 缴费月份 */ - @JsonFormat(pattern = "YYYY-MM") + @JsonFormat(pattern = "yyyy-MM") private Date month; /** diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxSlideshowBo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxSlideshowBo.java index 308f198..946abd1 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxSlideshowBo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxSlideshowBo.java @@ -39,6 +39,11 @@ public class WxSlideshowBo extends BaseEntity { */ private String skipUrl; + /** + * 类型（1首页轮播图 2个人中心轮播图） + */ + private Integer type; + /** * 是否启用（0否 1是） */ diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxLiveBillVo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxLiveBillVo.java index 4bf1970..624e781 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxLiveBillVo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxLiveBillVo.java @@ -2,6 +2,9 @@ package com.propertyManagement.business.domain.vo; import java.math.BigDecimal; import java.util.Date; + +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -108,6 +111,8 @@ public class WxLiveBillVo implements Serializable { * 缴费月份 */ @ExcelProperty(value = "缴费月份") + @DateTimeFormat("YYYY-MM") + @ColumnWidth(18) private Date month; /** @@ -143,5 +148,10 @@ public class WxLiveBillVo implements Serializable { @ExcelDictFormat(readConverterExp = "1=.小程序,2=.PC端") private Integer createType; + /** + * 创建时间 + */ + private Date createTime; + } diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxSlideshowVo.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxSlideshowVo.java index 4d743a8..ee73d1e 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxSlideshowVo.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxSlideshowVo.java @@ -40,6 +40,11 @@ public class WxSlideshowVo implements Serializable { @ExcelProperty(value = "跳转地址") private String skipUrl; + /** + * 类型（1首页轮播图 2个人中心轮播图） + */ + private Integer type; + /** * 是否启用（0否 1是） */ diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxCarportServiceImpl.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxCarportServiceImpl.java index 3ce326a..d4322b1 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxCarportServiceImpl.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxCarportServiceImpl.java @@ -69,6 +69,7 @@ public class WxCarportServiceImpl implements IWxCarportService { private LambdaQueryWrapper buildQueryWrapper(WxCarportBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCommunityId() != null, WxCarport::getCommunityId, bo.getCommunityId()); lqw.eq(bo.getProprietorId() != null, WxCarport::getProprietorId, bo.getProprietorId()); lqw.like(StringUtils.isNotBlank(bo.getProprietorName()), WxCarport::getProprietorName, bo.getProprietorName()); lqw.eq(StringUtils.isNotBlank(bo.getProprietorPhone()), WxCarport::getProprietorPhone, bo.getProprietorPhone()); diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxClockServiceImpl.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxClockServiceImpl.java index 2b61481..179e206 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxClockServiceImpl.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxClockServiceImpl.java @@ -93,6 +93,7 @@ public class WxClockServiceImpl implements IWxClockService { lqw.like(bo.getCommunityName() != null, WxClock::getCommunityName, bo.getCommunityName()); lqw.eq(bo.getClockTime() != null, WxClock::getClockTime, bo.getClockTime()); lqw.eq(bo.getClockUserRole() != null, WxClock::getClockUserRole, bo.getClockUserRole()); + lqw.between(bo.getClockStartTime() != null, WxClock::getClockTime, bo.getClockStartTime(), bo.getClockEndTime()); return lqw; } diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxFamilyMemberServiceImpl.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxFamilyMemberServiceImpl.java index ad44afa..caebd90 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxFamilyMemberServiceImpl.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxFamilyMemberServiceImpl.java @@ -70,6 +70,8 @@ public class WxFamilyMemberServiceImpl implements IWxFamilyMemberService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getUserId() != null, WxFamilyMember::getUserId, bo.getUserId()); + lqw.eq(bo.getProprietorId() != null, WxFamilyMember::getProprietorId, bo.getProprietorId()); + lqw.like(StringUtils.isNotBlank(bo.getProprietorName()), WxFamilyMember::getProprietorName, bo.getProprietorName()); lqw.eq(bo.getCommunityId() != null, WxFamilyMember::getCommunityId, bo.getCommunityId()); lqw.like(bo.getCommunityName() != null, WxFamilyMember::getCommunityName, bo.getCommunityName()); lqw.eq(StringUtils.isNotBlank(bo.getAvatar()), WxFamilyMember::getAvatar, bo.getAvatar()); diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxGuestServiceImpl.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxGuestServiceImpl.java index 5a8f68c..59d023b 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxGuestServiceImpl.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxGuestServiceImpl.java @@ -75,6 +75,7 @@ public class WxGuestServiceImpl implements IWxGuestService { lqw.eq(StringUtils.isNotBlank(bo.getPlateNumber()), WxGuest::getPlateNumber, bo.getPlateNumber()); lqw.eq(bo.getCommunityId() != null, WxGuest::getCommunityId, bo.getCommunityId()); lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), WxGuest::getCommunityName, bo.getCommunityName()); + lqw.between(bo.getGuestStartTime() != null, WxGuest::getGuestTime, bo.getGuestStartTime(), bo.getGuestEndTime()); lqw.orderByDesc(WxGuest::getCreateTime); return lqw; } diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxLiveBillServiceImpl.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxLiveBillServiceImpl.java index 4e1fbcc..fb4df2f 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxLiveBillServiceImpl.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxLiveBillServiceImpl.java @@ -1,7 +1,9 @@ package com.propertyManagement.business.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.propertyManagement.business.domain.WxCarport; import com.propertyManagement.business.domain.vo.LoginWxUser; +import com.propertyManagement.business.mapper.WxCarportMapper; import com.propertyManagement.business.support.util.AuthUtil; import com.propertyManagement.common.enums.LiveBillCreateType; import com.propertyManagement.common.enums.LiveBillType; @@ -34,6 +36,7 @@ import java.util.Collection; public class WxLiveBillServiceImpl implements IWxLiveBillService { private final WxLiveBillMapper baseMapper; + private final WxCarportMapper carportMapper; /** * 查询生活缴费账单 @@ -109,6 +112,11 @@ public class WxLiveBillServiceImpl implements IWxLiveBillService { public Boolean insertByBo(WxLiveBillBo bo) { WxLiveBill add = BeanUtil.toBean(bo, WxLiveBill.class); add.setCreateType(LiveBillCreateType.TWO.getCode()); + if (bo.getCarportId() != null) { + WxCarport wxCarport = carportMapper.selectById(bo.getCarportId()); + add.setCarportNumber(wxCarport.getCarportNumber()); + add.setPlateNumber(wxCarport.getPlateNumber()); + } boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setBillId(add.getBillId()); @@ -122,7 +130,11 @@ public class WxLiveBillServiceImpl implements IWxLiveBillService { @Override public Boolean updateByBo(WxLiveBillBo bo) { WxLiveBill update = BeanUtil.toBean(bo, WxLiveBill.class); - validEntityBeforeSave(update); + if (bo.getCarportId() != null) { + WxCarport wxCarport = carportMapper.selectById(bo.getCarportId()); + update.setCarportNumber(wxCarport.getCarportNumber()); + update.setPlateNumber(wxCarport.getPlateNumber()); + } return baseMapper.updateById(update) > 0; } diff --git a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxRepairsServiceImpl.java b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxRepairsServiceImpl.java index e2be5b2..257af43 100644 --- a/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxRepairsServiceImpl.java +++ b/propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxRepairsServiceImpl.java @@ -114,10 +114,20 @@ public class WxRepairsServiceImpl implements IWxRepairsService { .eq(WxRepairs::getState, RepairsState.ONE.getCode()); map.put(RepairsState.ONE.getCode(), baseMapper.selectCount(lambdaQueryWrapper)); lambdaQueryWrapper.clear(); + lambdaQueryWrapper + .eq(WxRepairs::getAccountId, wxUser.getAccountId()) + .eq(WxRepairs::getState, RepairsState.TWO.getCode()); + map.put(RepairsState.TWO.getCode(), baseMapper.selectCount(lambdaQueryWrapper)); + lambdaQueryWrapper.clear(); lambdaQueryWrapper .eq(WxRepairs::getAccountId, wxUser.getAccountId()) .eq(WxRepairs::getState, RepairsState.THREE.getCode()); map.put(RepairsState.THREE.getCode(), baseMapper.selectCount(lambdaQueryWrapper)); + lambdaQueryWrapper.clear(); + lambdaQueryWrapper + .eq(WxRepairs::getAccountId, wxUser.getAccountId()) + .eq(WxRepairs::getState, RepairsState.FOUR.getCode()); + map.put(RepairsState.FOUR.getCode(), baseMapper.selectCount(lambdaQueryWrapper)); return map; } diff --git a/propertyManagement-ui/src/api/business/carport.js b/propertyManagement-ui/src/api/business/carport.js index f5f03d2..cf4a629 100644 --- a/propertyManagement-ui/src/api/business/carport.js +++ b/propertyManagement-ui/src/api/business/carport.js @@ -9,6 +9,15 @@ export function listCarport(query) { }) } +// 查询业主车位列表 +export function listCarportAll(query) { + return request({ + url: '/business/carport/listAll', + method: 'get', + params: query + }) +} + // 查询业主车位详细 export function getCarport(carportId) { return request({ diff --git a/propertyManagement-ui/src/views/business/account/index.vue b/propertyManagement-ui/src/views/business/account/index.vue index 5a018bc..3d4a0c5 100644 --- a/propertyManagement-ui/src/views/business/account/index.vue +++ b/propertyManagement-ui/src/views/business/account/index.vue @@ -192,12 +192,8 @@ - + + diff --git a/propertyManagement-ui/src/views/business/carport/index.vue b/propertyManagement-ui/src/views/business/carport/index.vue index ff5c304..dc934af 100644 --- a/propertyManagement-ui/src/views/business/carport/index.vue +++ b/propertyManagement-ui/src/views/business/carport/index.vue @@ -151,7 +151,7 @@ {{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }} - + diff --git a/propertyManagement-ui/src/views/business/comment/index.vue b/propertyManagement-ui/src/views/business/comment/index.vue index 1a4a590..f382911 100644 --- a/propertyManagement-ui/src/views/business/comment/index.vue +++ b/propertyManagement-ui/src/views/business/comment/index.vue @@ -26,14 +26,14 @@ /> - - - + + + + + + + + 搜索 重置 @@ -139,7 +139,6 @@ icon="el-icon-edit" @click="handleComplete(scope.row)" v-if="scope.row.state === 1" - v-hasPermi="['business:comment:remove']" >处理完成 diff --git a/propertyManagement-ui/src/views/business/guest/index.vue b/propertyManagement-ui/src/views/business/guest/index.vue index dd878c1..7279fd9 100644 --- a/propertyManagement-ui/src/views/business/guest/index.vue +++ b/propertyManagement-ui/src/views/business/guest/index.vue @@ -15,12 +15,21 @@ /> - - + + + + + + + 0) { + this.queryParams.guestStartTime = this.guestTime[0]; + this.queryParams.guestEndTime = this.guestTime[1]; + }else { + this.queryParams.guestStartTime = undefined; + this.queryParams.guestEndTime = undefined; + } listGuest(this.queryParams).then(response => { this.guestList = response.rows; this.total = response.total; @@ -295,6 +312,7 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.guestTime = [] this.resetForm("queryForm"); this.handleQuery(); }, diff --git a/propertyManagement-ui/src/views/business/liveBill/index.vue b/propertyManagement-ui/src/views/business/liveBill/index.vue index ff29d63..c4a7251 100644 --- a/propertyManagement-ui/src/views/business/liveBill/index.vue +++ b/propertyManagement-ui/src/views/business/liveBill/index.vue @@ -115,12 +115,12 @@ - - - + + + - + @@ -140,7 +140,12 @@ - + + + +