by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

修改了社区bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
yuyongle 2025-07-24 10:20:38 +08:00
parent 31291b4413
commit 81ebb3e8c1
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java
View File

@ -70,13 +70,13 @@ public class TbCommunityBo extends BaseEntity {
/** /**
* 经度 * 经度
*/ */
@NotBlank(message = "经度不能为空", groups = {AddGroup.class, EditGroup.class}) // @NotBlank(message = "经度不能为空", groups = {AddGroup.class, EditGroup.class})
private String lon; private String lon;
/** /**
* 维度 * 维度
*/ */
@NotBlank(message = "维度不能为空", groups = {AddGroup.class, EditGroup.class}) // @NotBlank(message = "维度不能为空", groups = {AddGroup.class, EditGroup.class})
private String lat; private String lat;
/** /**

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrderAnalysisVo.java
View File

@ -18,6 +18,7 @@ public class ServiceWorkOrderAnalysisVo {
private String date; private String date;
private String dayOfWeek; private String dayOfWeek;
private long count; private long count;
private long weekCount;
public LineChartVo() {} public LineChartVo() {}
@ -25,6 +26,7 @@ public class ServiceWorkOrderAnalysisVo {
this.date = date; this.date = date;
this.dayOfWeek = dayOfWeek; this.dayOfWeek = dayOfWeek;
this.count = count; this.count = count;
this.weekCount = weekCount;
} }
} }
@Data @Data

20
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerNoticesServiceImpl.java
View File

@ -3,6 +3,7 @@ package org.dromara.property.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jodd.util.StringUtil;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
@ -58,7 +59,24 @@ public class CustomerNoticesServiceImpl implements ICustomerNoticesService {
*/ */
@Override @Override
public CustomerNoticesVo queryById(Long id) { public CustomerNoticesVo queryById(Long id) {
return baseMapper.selectVoById(id); List<ResidentPerson> residentPeople = residentPersonMapper.selectList();
CustomerNoticesVo customerNoticesVo = baseMapper.selectVoById(id);
if (CollUtil.isNotEmpty(residentPeople)) {
ResidentPerson residentPerson = residentPeople.stream()
.filter(vo -> vo.getId() != null && vo.getId().equals(customerNoticesVo.getIssuers())).findFirst().orElse(null);
customerNoticesVo.setIssuersName(residentPerson.getUserName());
if (ObjectUtil.isNotEmpty(customerNoticesVo.getNoticePersion())) {
List<String> list = Arrays.asList(customerNoticesVo.getNoticePersion().split(","));
List<ResidentPerson> filteredList = residentPeople.stream()
.filter(person -> list.contains(person.getId().toString()))
.collect(Collectors.toList());
String usernames = filteredList.stream()
.map(ResidentPerson::getUserName) // 假设ResidentPerson类有一个getUserName方法
.collect(Collectors.joining(","));
customerNoticesVo.setIssuersName(StringUtils.isNotBlank(usernames)?usernames:null);
}
}
return customerNoticesVo;
} }
/** /**