xyh
2021-06-28 a127eff5f3eb34b438f629272991224ae33e417e
id序列化字符串
4个文件已修改
30 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.visit;
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.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
@@ -22,21 +24,25 @@
    private static final long serialVersionUID = -5758072851661612412L;
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("需走访人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long visiterId;
    @ApiModelProperty("需走访人姓名")
    private String visiterName;
    @ApiModelProperty("网格员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMember;
    @ApiModelProperty("网格员")
    private String gridMemberName;
    @ApiModelProperty("处理人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dellUserId;
    @ApiModelProperty("处理人")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSONObject;
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.model.dtos.EventResourceDTO;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
@@ -26,15 +28,19 @@
public class EventVisitingTasksDetailsVO {
    @ApiModelProperty(value = "id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty(value = "网格员所处的街道")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberStreet;
    @ApiModelProperty(value = "网格员所处社区")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberCommunity;
    @ApiModelProperty(value = "网格员")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMember;
    @ApiModelProperty(value = "网格员名字")
@@ -44,6 +50,7 @@
    private String gridMenberTele;
    @ApiModelProperty(value = "需走访人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long visiterId;
    @ApiModelProperty(value = "需走访人名字")
@@ -94,6 +101,7 @@
    private Integer dellType;
    @ApiModelProperty(value = "处理人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dellUserId;
    @ApiModelProperty(value = "处理人名称")
@@ -126,6 +134,7 @@
    private JSONObject tableContentJson;
    @ApiModelProperty(value = "创建人")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long createBy;
    @ApiModelProperty(value = "创建事件")
@@ -133,6 +142,7 @@
    private Date createAt;
    @ApiModelProperty(value = "修改人")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long updateBy;
    @ApiModelProperty(value = "修改时间")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
@@ -2,6 +2,8 @@
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;
@@ -25,6 +27,7 @@
public class EventVisitingTasksVO {
    @ApiModelProperty(value = "id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ExcelProperty(value = "序号",index = 0)
@@ -77,15 +80,19 @@
    @ApiModelProperty(value = "需走访人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long visiterId;
    @ApiModelProperty(value = "网格员所处的街道")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberStreet;
    @ApiModelProperty(value = "网格员所处社区")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMemberCommunity;
    @ApiModelProperty(value = "网格员")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gridMember;
    @ApiModelProperty(value = "网格员名字")
@@ -149,6 +156,7 @@
    private Integer dellType;
    @ApiModelProperty(value = "处理人ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dellUserId;
@@ -178,10 +186,12 @@
    private String tableContentJson;
    @ApiModelProperty(value = "创建人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long createBy;
    @ApiModelProperty(value = "修改人")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long updateBy;
    @ApiModelProperty(value = "修改时间")
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java
@@ -100,8 +100,8 @@
            response.setCharacterEncoding("utf-8");
            String fileName = "走访任务-"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss");
            response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20") + ".xlsx");
            // 如果不用模板的方式导出的话,是doWrite
            EasyExcel.write(response.getOutputStream(), EventVisitingTasksVO.class).sheet(fileName).doWrite(list);
            EasyExcel.write(os, EventVisitingTasksVO.class).sheet(fileName).doWrite(list);
            os.flush();
        } catch (IOException e) {
            e.printStackTrace();
        }finally {