From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 13 三月 2025 19:58:45 +0800 Subject: [PATCH] 党员、诉求评论基础代码 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java | 239 ++++++++++++++++++++++++++++------------------------------- 1 files changed, 115 insertions(+), 124 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java index ec7b1ea..8ee2240 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java @@ -1,16 +1,20 @@ package com.panzhihua.common.model.vos.visit; +import java.util.Date; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.panzhihua.common.enums.EventTasksStatusEnum; import com.panzhihua.common.enums.EventTasksVisitorTypeEnum; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import java.util.Date; /** * @@ -18,189 +22,176 @@ * @version 1.0 * @since 1.0 * @date 2021-05-26 - * */ + */ @Data @ApiModel("重点人群走访记录返回参数") +@ExcelIgnoreUnannotated @EncryptDecryptClass public class EventVisitingTasksVO { - @ApiModelProperty(value = "id") - private Long id; + @ApiModelProperty(value = "id") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; - @ExcelProperty(value = "序号",index = 0) - private Integer rowNum; + // @ExcelProperty(value = "序号",index = 0) + // private Integer rowNum; - @ExcelProperty(value = "创建时间",index = 1) - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createAt; + @ExcelProperty(value = "创建时间", index = 0) + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createAt; - @ExcelProperty(value = "创建人",index = 2) - @ApiModelProperty(value = "创建人") - private String creator; + @ExcelProperty(value = "创建人", index = 1) + @ApiModelProperty(value = "创建人") + private String creator; - @ExcelProperty(value = "走访对象",index = 3) - @ApiModelProperty(value = "需走访人名字") - private String visiterName; + @ExcelProperty(value = "走访对象", index = 2) + @ApiModelProperty(value = "需走访人名字") + private String visiterName; + @ExcelProperty(value = "身份证号码", index = 3) + @ApiModelProperty(value = "身份证号码") + @EncryptDecryptField + private String cardNoStr; - @ExcelProperty(value = "身份证号码",index = 4) - @ApiModelProperty(value = "身份证号码") - private String cardNoStr; + @ExcelProperty(value = "走访地址", index = 4) + @ApiModelProperty(value = "走访地址") + private String visiterAddress; - @ExcelProperty(value = "走访地址",index = 5) - @ApiModelProperty(value = "走访地址") - private String visiterAddress; + @ExcelProperty(value = "人员标签", index = 5) + @ApiModelProperty(value = "人员标签") + private String visiterTypeName; - @ExcelProperty(value = "人员标签",index = 6) - @ApiModelProperty(value = "人员标签") - private String visiterTypeName; + @ExcelProperty(value = "走访人", index = 6) + @ApiModelProperty(value = "走访人") + private String dellUserName; - @ExcelProperty(value = "走访人",index = 7) - @ApiModelProperty(value = "走访人") - private String dellUserName; + @ExcelProperty(value = "完成走访时间", index = 7) + @ApiModelProperty(value = "完成走访时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date submitDate; - @ExcelProperty(value = "完成走访时间",index = 8) - @ApiModelProperty(value = "完成走访时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date submitDate; + @ExcelProperty(value = "撤销时间", index = 8) + @ApiModelProperty(value = "撤销时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date cancelTime; - @ExcelProperty(value = "撤销时间",index = 9) - @ApiModelProperty(value = "撤销时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date cancelTime; + @ExcelProperty(value = "状态", index = 9) + @ApiModelProperty(value = "状态") + private String eventStatusName; - @ExcelProperty(value = "状态",index = 10) - @ApiModelProperty(value = "状态") - private String eventStatusName; - - - - @ApiModelProperty(value = "需走访人ID") - private Long visiterId; + @ApiModelProperty(value = "需走访人ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long visiterId; @ApiModelProperty(value = "网格员所处的街道") - private Long gridMemberStreet; + @JsonSerialize(using = ToStringSerializer.class) + private Long gridMemberStreet; @ApiModelProperty(value = "网格员所处社区") - private Long gridMemberCommunity; + @JsonSerialize(using = ToStringSerializer.class) + private Long gridMemberCommunity; @ApiModelProperty(value = "网格员") - private Long gridMember; + @JsonSerialize(using = ToStringSerializer.class) + private Long gridMember; @ApiModelProperty(value = "网格员名字") - private String gridMemberName; + private String gridMemberName; @ApiModelProperty(value = "网格员联系方式") - private String gridMenberTele; + private String gridMenberTele; + @ApiModelProperty(value = "所属网格") + private String gridName; @ApiModelProperty(value = "需走访人员性别") - private Integer visiterSex; + private Integer visiterSex; @ApiModelProperty(value = "需走访人电话") - @EncryptDecryptField - private String visiterTele; + @EncryptDecryptField + private String visiterTele; - - private Integer visiterType; + private Integer visiterType; @ApiModelProperty(value = "事件标题") - private String eventTitle; + private String eventTitle; @ApiModelProperty(value = "事件类型") - private Integer eventType; + private Integer eventType; @ApiModelProperty(value = "事件描述") - private String eventDes; + private String eventDes; @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)") - private Integer actOpara; + private Integer actOpara; @ApiModelProperty(value = "发生时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date happenTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date happenTime; @ApiModelProperty(value = "发生地点") - private String happentAddress; + private String happentAddress; @ApiModelProperty(value = "发生的精度纬度信息(逗号隔开)") - private String happentLatLng; - private Integer eventStatus; - - public String getEventStatusName() { - if(eventStatus == null){ - return null; - } - return EventTasksStatusEnum.getName(eventStatus); - } - - public String getVisiterTypeName(){ - if(visiterType == null){ - return null; - } - return EventTasksVisitorTypeEnum.getName(visiterType); - } - + private String happentLatLng; + private Integer eventStatus; @ApiModelProperty(value = "上报状态") - private Integer reporting; - + private Integer reporting; @ApiModelProperty(value = "当前处理对象类型(1、网格员2、社区3、是街道)") - private Integer dellType; - + private Integer dellType; @ApiModelProperty(value = "处理人ID") - private Long dellUserId; - - - + @JsonSerialize(using = ToStringSerializer.class) + private Long dellUserId; @ApiModelProperty(value = "处理时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date dellDate; - - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dellDate; @ApiModelProperty(value = "解决人针对解决事件的处理描述") - private String dellDesc; - + private String dellDesc; @ApiModelProperty(value = "是否有效") - private Boolean invalid; - + private Boolean invalid; @ApiModelProperty(value = "是否紧急") - private Boolean urgent; - + private Boolean urgent; @ApiModelProperty(value = "是否催办") - private Boolean urgentDell; - - - @ApiModelProperty(value = "是否异常行为") - private Boolean exception; - + private Boolean urgentDell; + @ApiModelProperty(value = "是否异常行为(1.是 0.否)") + private Integer exception; @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同,录入全部的表单内容数据") - private String tableContentJson; - + private String tableContentJson; @ApiModelProperty(value = "创建人id") - private Long createBy; - - + @JsonSerialize(using = ToStringSerializer.class) + private Long createBy; @ApiModelProperty(value = "修改人") - private Long updateBy; - + @JsonSerialize(using = ToStringSerializer.class) + private Long updateBy; @ApiModelProperty(value = "修改时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date updateAt; - - @ApiModelProperty(value = "标签") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateAt; + @ApiModelProperty(value = "标签") private String label; + @ApiModelProperty(value = "年龄") + private Integer age; + @ApiModelProperty(value = "电话") + private String phone; + private Integer nationCode; + @ApiModelProperty(value = "民族") + private String nation; + @ApiModelProperty( + value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)") + private Integer politicalOutlook; - @ApiModelProperty(value = "年龄") - private Integer age; + public String getEventStatusName() { + if (eventStatus == null) { + return null; + } + return EventTasksStatusEnum.getName(eventStatus); + } - @ApiModelProperty(value = "电话") - private String phone; - - private Integer nationCode; - - @ApiModelProperty(value = "民族") - private String nation; - + public String getVisiterTypeName() { + if (visiterType == null) { + return null; + } + return EventTasksVisitorTypeEnum.getName(visiterType); + } } -- Gitblit v1.7.1