renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大屏服务详情修改

Browse Source
This commit is contained in:
wanghao
2025-12-13 17:32:11 +08:00
parent fbf8b11d4f
commit 3bc6566f2d
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java
+14
View File
@@ -1,7 +1,11 @@
package com.renkang.emergency.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class PhoneListDTO {
@@ -35,4 +39,14 @@ public class PhoneListDTO {
*/
@Schema(description = "pageSize")
private Integer pageSize=10;
@Schema(description = "startDate")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@Schema(description = "endDate")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate;
}
health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/StatisticsDTO.java
+3
View File
@@ -2,6 +2,9 @@ package com.renkang.emergency.entity.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class StatisticsDTO {
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
+7
View File
@@ -1,6 +1,8 @@
package com.renkang.emergency.service.impl;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
@@ -329,6 +331,11 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
if (StrUtil.isNotBlank(dto.getSex()) && !"0".equals(dto.getSex())) {
queryWrapper.eq(TblUserHelp::getSex, dto.getSex());
}
if (ObjUtil.isNotEmpty(dto.getStartDate()) && ObjUtil.isNotEmpty(dto.getEndDate())) {
queryWrapper.between(TblUserHelp::getHelpTime,
DateUtil.beginOfDay(dto.getStartDate()),
DateUtil.endOfDay(dto.getEndDate()).offset(DateField.MILLISECOND, -999));
}
queryWrapper.orderByDesc(TblUserHelp::getHelpTime);
Page<TblUserHelp> returnPage = this.page(new Page<>(dto.getPageNo(), dto.getPageSize()), queryWrapper);
Page<TblQimoNoticeVo> pageVo = new Page<>();