Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.技术监督功能干扰源用户代码提交

Browse Source
This commit is contained in:
cdf
2024-04-10 09:02:17 +08:00
parent 90de9184d4
commit 859be88988
6 changed files with 161 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java
View File

@@ -34,11 +34,9 @@ public class LoadTypeUserIUploadParam {
private Integer iIsOverLimit;
@ApiModelProperty(name = "iOverLimitTarget",value = "入网超标指标",required = true)
@NotBlank(message = "入网超标指标不可为空")
private String iOverLimitTarget;
@ApiModelProperty(name = "iPlanStep",value = "入网计划采取措施",required = true)
@NotBlank(message = "入网计划采取措施不可为空")
private String iPlanStep;
@ApiModelProperty(name = "iDescription",value = "入网详情")

23
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java
View File

@@ -1,9 +1,18 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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 lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -19,6 +28,7 @@ public class RLoadTypeUserManage implements Serializable {
/**
* 主键
*/
@TableId
private String id;
/**
* 单位ID
@@ -63,7 +73,7 @@ public class RLoadTypeUserManage implements Serializable {
/**
* 入网报告状态，字典ID
*/
private String iStatus;
private Integer iStatus;
/**
*入网报告审核人
*/
@@ -108,7 +118,7 @@ public class RLoadTypeUserManage implements Serializable {
/**
* 实测报告状态，字典ID
*/
private String aStatus;
private Integer aStatus;
/**
*实测报告审核人
*/
@@ -146,6 +156,15 @@ public class RLoadTypeUserManage implements Serializable {
*/
private String aDescription;
@TableField(fill = FieldFill.INSERT)
private String createBy;
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
private LocalDateTime createTime;
}

36
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -74,7 +75,18 @@ public class RLoadTypeUserManageVO implements Serializable {
* 入网报告状态，字典ID
*/
@ApiModelProperty("入网报告状态，字典ID")
private String iStatus;
private Integer iStatus;
/**
*入网报告审核人
*/
private String iCheckPerson;
private String iCheckPersonName;
/**
*入网报告审核意见
*/
private String iCheckComment;
/**
* 入网报告路径
*/
@@ -119,7 +131,7 @@ public class RLoadTypeUserManageVO implements Serializable {
* 实测报告状态，字典ID
*/
@ApiModelProperty("实测报告状态，字典ID")
private String aStatus;
private Integer aStatus;
/**
* 实测报告路径
*/
@@ -130,6 +142,18 @@ public class RLoadTypeUserManageVO implements Serializable {
*/
@ApiModelProperty("实测报告名称")
private String aFilePathName;
/**
*实测报告审核人
*/
private String aCheckPerson;
private String aCheckPersonName;
/**
*实测报告审核意见
*/
private String aCheckComment;
/**
* 实测报告上传时间
*/
@@ -165,5 +189,13 @@ public class RLoadTypeUserManageVO implements Serializable {
@ApiModelProperty("实测报告文件地址")
private String aFile;
private String createBy;
private String createByName;
private LocalDateTime createTime;
}