From eeeae803a67b584de77921d42bb6f71a584a38ae Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Mon, 13 May 2024 11:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=BA=BF=E6=80=A7=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=88=97=E8=A1=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/vo/user/UserReportVO.java | 21 +++++++++++++++++++ .../user/mapping/UserReportPOMapper.xml | 1 + .../user/impl/UserReportPOServiceImpl.java | 1 - 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java index 91f4c2f3f..f26e859d6 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java @@ -1,7 +1,12 @@ package com.njcn.supervision.pojo.vo.user; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.njcn.supervision.pojo.po.user.UserReportProjectPO; import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; @@ -9,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; +import java.time.LocalDateTime; /** * @@ -108,12 +114,27 @@ public class UserReportVO { @ApiModelProperty(value = "预测评估结论") private String evaluationConclusion; + /** + * 流程实例的编号 + */ + @ApiModelProperty(value = "流程实例的编号") + private String processInstanceId; + + /** * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消 */ @TableField(value = "`status`") private Integer status; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime createTime; private UserReportProjectPO userReportProjectPO; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml index da869bd81..c8c364a27 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml @@ -48,6 +48,7 @@ supervision_user_report.evaluation_dept, supervision_user_report.evaluation_conclusion, supervision_user_report.process_instance_id, + supervision_user_report.create_time, supervision_user_report.status FROM supervision_user_report supervision_user_report WHERE ${ew.sqlSegment} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index eb3ea78a9..acc8e37c8 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -170,7 +170,6 @@ public class UserReportPOServiceImpl extends ServiceImpl