From 9023c4ca64bfa342f5bc4c050f22fad07b59ef6f Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 14 Apr 2025 11:01:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/app/visitor/VisitorsAppPageVo.java | 127 ++++++++++++++++++ .../service/impl/VisitorsServiceImpl.java | 11 +- .../src/main/resources/application.yml | 2 +- 3 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/app/visitor/VisitorsAppPageVo.java diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/app/visitor/VisitorsAppPageVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/app/visitor/VisitorsAppPageVo.java new file mode 100644 index 00000000..c47ca934 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/app/visitor/VisitorsAppPageVo.java @@ -0,0 +1,127 @@ +package com.bsd.pjcloud.integrated.vo.app.visitor; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * 我的邀约 + * + * @author zjf + * @date 2025-04-09 15:22:47 + */ +@Data +@Schema(description = "访客表vo") +public class VisitorsAppPageVo { + + + /** + * id + */ + @Schema(description="id") + private Long id; + + /** + * 姓名 + */ + @Schema(description="姓名") + private String name; + + /** + * 手机号 + */ + @Schema(description="手机号") + private String mobile; + + /** + * 身份证号 + */ + @Schema(description="身份证号") + private String idCard; + + /** + * 描述 + */ + @Schema(description="描述") + private String description; + + /** + * 审核状态 + */ + @Schema(description="审核状态") + private String checkStatus; + + /** + * 到访单位 + */ + @Schema(description="到访单位") + private Long deptId; + + /** + * 接待人 + */ + @Schema(description="接待人") + private Long userName; + + /** + * 车牌号id + */ + @Schema(description="车牌号id") + private Long carId; + + /** + * 公司名称 + */ + @Schema(description="公司名称") + private String companyName; + + /** + * 随行人员数量 + */ + @Schema(description="随行人员数量") + private Integer peopleNumber; + + /** + * 到访时间 + */ + @Schema(description="到访时间") + private LocalDateTime vStartDate; + /** + * 到访时间 + */ + @Schema(description="到访时间") + private LocalDateTime vEndDate; + + /** + * 是否驾驶车辆0 否 1是 + */ + @Schema(description="是否驾驶车辆0 否 1是") + private String isDrive; + + + /** + * 审核原因 + */ + @Schema(description="审核原因") + private String checkReason; + + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + + + @Schema(description="token") + private String token; + + @Schema(description="车牌号") + private List visitorsCarAppVos; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java index c13f2bbd..0c95170b 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java @@ -22,6 +22,7 @@ import com.bsd.pjcloud.integrated.entity.VisitorsEntity; import com.bsd.pjcloud.integrated.mapper.VisitorsCarMapper; import com.bsd.pjcloud.integrated.mapper.VisitorsMapper; import com.bsd.pjcloud.integrated.service.VisitorsService; +import com.bsd.pjcloud.integrated.vo.app.visitor.VisitorsAppPageVo; import com.bsd.pjcloud.integrated.vo.app.visitor.VisitorsAppVo; import com.bsd.pjcloud.integrated.vo.app.visitor.VisitorsCarAppVo; import lombok.AllArgsConstructor; @@ -147,13 +148,15 @@ public class VisitorsServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(VisitorsEntity::getUserId, userId); Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + List records = pageData.getRecords(); - //todo - pageData.getRecords().forEach(i->{ - }); + Page resultPage = new Page<>(); + org.springframework.beans.BeanUtils.copyProperties(pageData, resultPage, "records"); // 复制分页参数 + List visitorsAppPageVos = BeanUtils.toBean(records, VisitorsAppPageVo.class); + resultPage.setRecords(visitorsAppPageVos); - return pageData; + return resultPage; } diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml index b2eb935f..ed59fc89 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml @@ -99,7 +99,7 @@ sms: templates: 20657: # 验证码模板 - content: "您好，您的验证码是{code}，有效时间{s1}分钟，请勿转发！" + content: "您好，您的验证码是{code}，有效时间{date}分钟，请勿转发！" params: ["code", "date"] 20658: content: "您的访客预约申请已通过，请通过地址{url}查看详情！"